Fix conflict

diff --cc extra/inverse/inverse.factor
index 36b2e907789a686aa6cb66583db3c8faacab3bb0,f4bd403b7597a81eee98610ced2f881314d6070e..d524180471be6d850c416cbf2e3ab2d81ea8d2c2
--- 1/extra/inverse/inverse.factor
--- 2/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@@ -1,8 -1,8 +1,8 @@@
  USING: kernel words inspector slots quotations sequences assocs
  math arrays inference effects shuffle continuations debugger
 -tuples namespaces vectors bit-arrays byte-arrays strings sbufs
 -math.functions macros sequences.private combinators mirrors
 -combinators.lib ;
 +classes.tuple namespaces vectors bit-arrays byte-arrays strings
 +sbufs math.functions macros sequences.private combinators
- mirrors ;
++mirrors combinators.lib ;
  IN: inverse
  
  TUPLE: fail ;