fix conflicts

diff --cc src/emacsgtkfixed.c
index 1e57eeb57c4dbd399ec7620dce027cb9568b2e80,44f5cde1b0b4f1a1351553e0ca02b8b72db1f3ab..8de2db4dca59411b95fdfcd740d3787c7689378c
--- 1/src/emacsgtkfixed.c
--- 2/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -23,9 -23,6 +23,12 @@@ along with GNU Emacs.  If not, see <htt
  #include "lisp.h"
  #include "frame.h"
  #include "xterm.h"
++<<<<<<< HEAD
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
++=======
++>>>>>>> trunk
  #include "emacsgtkfixed.h"
  
  /* Silence a bogus diagnostic; see GNOME bug 683906.  */

diff --cc src/emacsgtkfixed.h
index 4cea0b233321363d1f2129266e01add3c72cb093,773ca26b1433a130d48f4379b6d4377d86e96821..c7468e39c7b2cef2a79ba163ad03ca0fc8464009
--- 1/src/emacsgtkfixed.h
--- 2/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@@ -25,35 -25,7 +25,38 @@@ along with GNU Emacs.  If not, see <htt
  
  G_BEGIN_DECLS
  
++<<<<<<< HEAD
 +struct frame;
 +
 +#define EMACS_TYPE_FIXED                  (emacs_fixed_get_type ())
 +#define EMACS_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed))
 +#define EMACS_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass))
 +#define EMACS_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED))
 +#define EMACS_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), EMACS_TYPE_FIXED))
 +#define EMACS_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), EMACS_TYPE_FIXED, EmacsFixedClass))
 +
 +//typedef struct _EmacsFixed              EmacsFixed;
 +typedef struct _EmacsFixedPrivate       EmacsFixedPrivate;
 +typedef struct _EmacsFixedClass         EmacsFixedClass;
 +
 +struct _EmacsFixed
 +{
 +  GtkFixed container;
 +
 +  /*< private >*/
 +  EmacsFixedPrivate *priv;
 +};
 +
 +
 +struct _EmacsFixedClass
 +{
 +  GtkFixedClass parent_class;
 +};
 +
++=======
++>>>>>>> trunk
  extern GtkWidget *emacs_fixed_new (struct frame *f);
 +extern GType emacs_fixed_get_type (void);
  
  G_END_DECLS
  

diff --cc src/window.c
index 410015e472e54fed5e5a3a0129c508782966901f,6a52ed7e166ac8725899f873ce3d4709d4ce3117..5c4527f46714c22106dd10afbfe74b83993e9b64
--- 1/src/window.c
--- 2/src/window.c
+++ b/src/window.c
@@@ -45,12 -45,6 +45,15 @@@ along with GNU Emacs.  If not, see <htt
  #ifdef MSDOS
  #include "msdos.h"
  #endif
++<<<<<<< HEAD
 +#ifdef HAVE_NS
 +#include "nsterm.h"
 +#endif
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
++=======
++>>>>>>> trunk
  
  Lisp_Object Qwindowp, Qwindow_live_p;
  static Lisp_Object Qwindow_valid_p;

diff --cc src/xdisp.c
index b9a16ffcc434a82d949238083cdfe131a3d11061,df3fa3668036c981d2f07e3e119d35890e76eea9..0e3d398035a14a4f6cd6b47d56d700cc57444dda
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -303,10 -303,6 +303,13 @@@ along with GNU Emacs.  If not, see <htt
  #include TERM_HEADER
  #endif /* HAVE_WINDOW_SYSTEM */
  
++<<<<<<< HEAD
 +#include "font.h"
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
++=======
++>>>>>>> trunk
  #ifndef FRAME_X_OUTPUT
  #define FRAME_X_OUTPUT(f) ((f)->output_data.x)
  #endif