diff --git a/extra/x11/windows/windows.factor b/extra/x11/windows/windows.factor
index b3220d44bd..f9158c2956 100755
--- a/extra/x11/windows/windows.factor
+++ b/extra/x11/windows/windows.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2006 Eduardo Cavazos and Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types hashtables kernel math math.vectors
+USING: alien alien.c-types hashtables kernel math math.vectors math.bitfields
 namespaces sequences x11.xlib x11.constants x11.glx ;
 IN: x11.windows
 
@@ -12,7 +12,6 @@ IN: x11.windows
     XCreateColormap ;
 
 : event-mask ( -- n )
-<<<<<<< HEAD:extra/x11/windows/windows.factor
     {
         ExposureMask
         StructureNotifyMask
@@ -26,19 +25,6 @@ IN: x11.windows
         LeaveWindowMask
         PropertyChangeMask
     } flags ;
-=======
-    ExposureMask
-    StructureNotifyMask bitor
-    KeyPressMask bitor
-    KeyReleaseMask bitor
-    ButtonPressMask     bitor
-    ButtonReleaseMask bitor
-    PointerMotionMask bitor
-    FocusChangeMask bitor
-    EnterWindowMask bitor
-    LeaveWindowMask bitor
-    PropertyChangeMask bitor ;
->>>>>>> a05c18152b59073c49aa313ba685516310ec74a8:extra/x11/windows/windows.factor
 
 : window-attributes ( visinfo -- attributes )
     "XSetWindowAttributes" <c-object>
diff --git a/extra/x11/xlib/xlib.factor b/extra/x11/xlib/xlib.factor
index 230b24c6d0..70006c9f64 100755
--- a/extra/x11/xlib/xlib.factor
+++ b/extra/x11/xlib/xlib.factor
@@ -12,7 +12,7 @@
 ! and note the section.
 
 USING: kernel arrays alien alien.c-types alien.syntax
-math words sequences namespaces continuations ;
+math math.bitfields words sequences namespaces continuations ;
 IN: x11.xlib
 
 LIBRARY: xlib
@@ -1078,16 +1078,16 @@ FUNCTION: Status XWithdrawWindow (
 
 ! 17.1.7 - Setting and Reading the WM_NORMAL_HINTS Property
 
-: USPosition	1 0 shift ; inline
-: USSize	1 1 shift ; inline
-: PPosition	1 2 shift ; inline
-: PSize		1 3 shift ; inline
-: PMinSize	1 4 shift ; inline
-: PMaxSize	1 5 shift ; inline
-: PResizeInc	1 6 shift ; inline
-: PAspect	1 7 shift ; inline
-: PBaseSize	1 8 shift ; inline
-: PWinGravity	1 9 shift ; inline
+: USPosition    1 0 shift ; inline
+: USSize        1 1 shift ; inline
+: PPosition     1 2 shift ; inline
+: PSize         1 3 shift ; inline
+: PMinSize      1 4 shift ; inline
+: PMaxSize      1 5 shift ; inline
+: PResizeInc    1 6 shift ; inline
+: PAspect       1 7 shift ; inline
+: PBaseSize     1 8 shift ; inline
+: PWinGravity   1 9 shift ; inline
 : PAllHints 
     { PPosition PSize PMinSize PMaxSize PResizeInc PAspect } flags ; foldable