Fix conflicts

diff --cc basis/alien/c-types/c-types.factor
Simple merge

diff --cc basis/alien/structs/structs.factor
index eb1528b649079a5d3ec336653fb2e304af0fdd5e,d1fdbef4c04620f9f58b475765db5d88c74d3f78..9bbb5ce2aa1ad57d7f5e7d8ea5bc99440d959d9f
--- 1/basis/alien/structs/structs.factor
--- 2/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@@ -38,10 -38,10 +38,10 @@@ M: struct-type stack-siz
  
  : c-struct? ( type -- ? ) (c-type) struct-type? ;
  
 -: (define-struct) ( name vocab size align fields -- )
 +: (define-struct) ( name size align fields -- )
-     >r [ align ] keep r>
+     [ [ align ] keep ] dip
      struct-type boa
 -    -rot define-c-type ;
 +    swap typedef ;
  
  : define-struct-early ( name vocab fields -- fields )
      [ first2 <field-spec> ] with with map ;

diff --cc basis/cocoa/views/views.factor
Simple merge

diff --cc basis/db/postgresql/lib/lib.factor
Simple merge

diff --cc basis/ui/render/render.factor
Simple merge

diff --cc basis/x11/glx/glx.factor
index 99bae97b14090f4991072e1f01f7158dc3b5bd3d,7a2012f0eab8a7156ac29b349e1e11e7fd68f53c..cd4fa3395e58a58db0b84a1bcd8be6574987df2b
--- 1/basis/x11/glx/glx.factor
--- 2/basis/x11/glx/glx.factor
+++ b/basis/x11/glx/glx.factor
@@@ -2,8 -2,8 +2,8 @@@
  ! See http://factorcode.org/license.txt for BSD license.
  !
  ! based on glx.h from xfree86, and some of glxtokens.h
- USING: alien alien.c-types alien.syntax alien.syntax.private x11.xlib
+ USING: alien alien.c-types alien.syntax x11.xlib
 -namespaces make kernel sequences parser words ;
 +namespaces make kernel sequences parser words specialized-arrays.int ;
  IN: x11.glx
  
  LIBRARY: glx

diff --cc core/words/words.factor
Simple merge