diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 7200dc7f5..b8713655e 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -5,7 +5,7 @@ DRI_SUBDIR = dri
 endif
 
 if GLUCOSE
-GLUCOSE_DIR=glucose
+GLUCOSE_DIR = glucose
 endif
 
 if DRI2
@@ -29,21 +29,12 @@ DOC_SUBDIR = doc
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
 	  ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
 	  xf8_16bpp loader dixmods exa modes \
-<<<<<<< HEAD:hw/xfree86/Makefile.am
-	  $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) $(GLUCOSE_DIR)
-=======
-	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
->>>>>>> 41aea6194bd29ab34cc166b3fd90eee64299ddf8:hw/xfree86/Makefile.am
+	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) $(GLUCOSE_DIR)
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
-<<<<<<< HEAD:hw/xfree86/Makefile.am
-               xf8_16bpp xf8_32bpp loader dixmods dri exa modes \
-	       utils doc glucose
-=======
                xf8_16bpp xf8_32bpp loader dixmods dri dri2 exa modes \
-	       utils doc
->>>>>>> 41aea6194bd29ab34cc166b3fd90eee64299ddf8:hw/xfree86/Makefile.am
+	       utils doc glucose
 
 bin_PROGRAMS = Xorg