Fix conflict

diff --cc extra/windows/advapi32/advapi32.factor
index e755d4707f08fd9a37e8b455afe997ce605dc059,fd2a9fb8af0335059020603e50621c3d6acaeb8a..3f6208204788a8ad1a4f67e8a9b9022cdb06a45d
mode 100755,100644..100755
--- 1/extra/windows/advapi32/advapi32.factor
--- 2/extra/windows/advapi32/advapi32.factor
+++ b/extra/windows/advapi32/advapi32.factor
@@@ -483,26 -483,20 +483,28 @@@ FUNCTION: BOOL LookupPrivilegeValueW ( 
  : TOKEN_QUERY_SOURCE           HEX: 0010 ; inline\r
  : TOKEN_ADJUST_DEFAULT         HEX: 0080 ; inline\r
  : TOKEN_READ STANDARD_RIGHTS_READ TOKEN_QUERY bitor ;\r
 -: TOKEN_WRITE       STANDARD_RIGHTS_WRITE\r
 -                                        TOKEN_ADJUST_PRIVILEGES bitor\r
 -                                        TOKEN_ADJUST_GROUPS bitor\r
 -                                        TOKEN_ADJUST_DEFAULT bitor ; foldable\r
 -: TOKEN_ALL_ACCESS  STANDARD_RIGHTS_REQUIRED\r
 -                                        TOKEN_ASSIGN_PRIMARY bitor\r
 -                                        TOKEN_DUPLICATE bitor\r
 -                                        TOKEN_IMPERSONATE bitor\r
 -                                        TOKEN_QUERY bitor\r
 -                                        TOKEN_QUERY_SOURCE bitor\r
 -                                        TOKEN_ADJUST_PRIVILEGES bitor\r
 -                                        TOKEN_ADJUST_GROUPS bitor\r
 -                                        TOKEN_ADJUST_SESSIONID bitor\r
 -                                        TOKEN_ADJUST_DEFAULT bitor ; foldable\r
++\r
 +: TOKEN_WRITE\r
 +    {\r
 +        STANDARD_RIGHTS_WRITE\r
 +        TOKEN_ADJUST_PRIVILEGES\r
 +        TOKEN_ADJUST_GROUPS\r
 +        TOKEN_ADJUST_DEFAULT\r
 +    } flags ; foldable\r
++\r
 +: TOKEN_ALL_ACCESS\r
 +    {\r
 +        STANDARD_RIGHTS_REQUIRED\r
 +        TOKEN_ASSIGN_PRIMARY\r
 +        TOKEN_DUPLICATE\r
 +        TOKEN_IMPERSONATE\r
 +        TOKEN_QUERY\r
 +        TOKEN_QUERY_SOURCE\r
 +        TOKEN_ADJUST_PRIVILEGES\r
 +        TOKEN_ADJUST_GROUPS\r
 +        TOKEN_ADJUST_SESSIONID\r
 +        TOKEN_ADJUST_DEFAULT\r
 +    } flags ; foldable\r
  \r
  FUNCTION: BOOL OpenProcessToken ( HANDLE ProcessHandle,\r
                                    DWORD DesiredAccess,\r

diff --cc extra/x/widgets/wm/frame/frame.factor
index 36b4fa1160d4e0aa607230a90a7c3f96a2acd242,ecf628b9c7c40f335262cf52caffc656140ca5a6..4e3b4e7c93c6530a564f644dd0adc3a6b366b8b1
mode 100755,100644..100755
--- 1/extra/x/widgets/wm/frame/frame.factor
--- 2/extra/x/widgets/wm/frame/frame.factor
+++ b/extra/x/widgets/wm/frame/frame.factor

diff --cc extra/x11/windows/windows.factor
index 586acc12108961377ba6e87753043d32cbde1aff,94695720ea9f703bee7795ec2f7e913737d753b0..b3220d44bdc286f78bb90175a6f8240c56f0e3a4
mode 100755,100644..100755
--- 1/extra/x11/windows/windows.factor
--- 2/extra/x11/windows/windows.factor
+++ b/extra/x11/windows/windows.factor
@@@ -12,19 -13,17 +12,33 @@@ IN: x11.window
      XCreateColormap ;
  
  : event-mask ( -- n )
++<<<<<<< HEAD:extra/x11/windows/windows.factor
 +    {
 +        ExposureMask
 +        StructureNotifyMask
 +        KeyPressMask
 +        KeyReleaseMask
 +        ButtonPressMask
 +        ButtonReleaseMask
 +        PointerMotionMask
 +        FocusChangeMask
 +        EnterWindowMask
 +        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 --cc extra/x11/xlib/xlib.factor
index a13b5539753ba86bcaceb8414830f4857f45f5e4,8dd8a55acce58039e50f1f9859c381d0030bcf94..230b24c6d041029f44f2ac0dc36d87ecd354a7fe
mode 100755,100644..100755
--- 1/extra/x11/xlib/xlib.factor
--- 2/extra/x11/xlib/xlib.factor
+++ b/extra/x11/xlib/xlib.factor