Fix conflict

diff --cc basis/game-input/iokit/iokit.factor
index c42d48d569eeda01542563d3aa866dea3babbec8,68ecaecc299c742da2953302ff3397bd67fbdd00..92c0c7173ae6b9d6948f307437e0c48379e42622
--- 1/basis/game-input/iokit/iokit.factor
--- 2/basis/game-input/iokit/iokit.factor
+++ b/basis/game-input/iokit/iokit.factor
@@@ -1,9 -1,9 +1,9 @@@
  USING: cocoa cocoa.plists core-foundation iokit iokit.hid
  kernel cocoa.enumeration destructors math.parser cocoa.application 
  sequences locals combinators.short-circuit threads
 -namespaces assocs vectors arrays combinators hints alien
 +namespaces assocs arrays combinators hints alien
  core-foundation.run-loop accessors sequences.private
- alien.c-types math parser game-input vectors ;
+ alien.c-types math parser game-input vectors bit-arrays ;
  IN: game-input.iokit
  
  SINGLETON: iokit-game-input-backend