Fix conflict

diff --cc core/alien/syntax/syntax-docs.factor
index 09169e63b41f03f383cb6ed2c8464a284acaac98,75255d905d70080b286ff7d0fc49ae8d463926c5..6565ea0e2c1cda13893d8332b2b9fdf86f1ae884
--- 1/core/alien/syntax/syntax-docs.factor
--- 2/core/alien/syntax/syntax-docs.factor
+++ b/core/alien/syntax/syntax-docs.factor
@@@ -88,8 -88,8 +88,6 @@@ HELP: typede
  { $description "Alises the C type " { $snippet "old" } " under the name " { $snippet "new" } "." }
  { $notes "Using this word in the same source file which defines C bindings can cause problems, because words are compiled before top-level forms are run. Use the " { $link POSTPONE: TYPEDEF: } " word instead." } ;
  
--{ typedef POSTPONE: TYPEDEF: POSTPONE: TYPEDEF-IF: } related-words
--{ POSTPONE: TYPEDEF: typedef POSTPONE: TYPEDEF-IF: } related-words
  { POSTPONE: TYPEDEF-IF: POSTPONE: TYPEDEF: typedef } related-words
  
  HELP: c-struct?

diff --cc extra/assocs/lib/lib.factor
index 50da66e6697d8663508fb3ba53076c57d446b7c4,5a277e2d8d454640b9dc2bf9b52bb47e2fa33306..00f330f0fc26b9336ed9eae6b716ef757b1e1188
mode 100644,100644..100755
--- 1/extra/assocs/lib/lib.factor
--- 2/extra/assocs/lib/lib.factor
+++ b/extra/assocs/lib/lib.factor
@@@ -7,13 -7,13 +7,13 @@@ IN: assocs.li
  : >set ( seq -- hash )
      [ dup ] H{ } map>assoc ;
  
- : ref-hash ( table key -- value ) swap at ;
+ : ref-at ( table key -- value ) swap at ;
  
--! set-hash with alternative stack effects
++! set-at with alternative stack effects
  
- : put-hash* ( table key value -- ) spin set-at ;
+ : put-at* ( table key value -- ) swap rot set-at ;
  
- : put-hash ( table key value -- table ) swap pick set-at ;
+ : put-at ( table key value -- table ) swap pick set-at ;
  
  ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!