Fix conflict

diff --cc extra/fuel/fuel.factor
index 58efe2d8ce3c85d1a977b302f2f670e547e6f0d6,017b20b54b6ff369caebb126ca1f92d7e4a1a652..11c70d5125f348223061da919e0024b5163c780b
--- 1/extra/fuel/fuel.factor
--- 2/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@@ -6,8 -6,8 +6,8 @@@ combinators compiler.units continuation
  eval help io io.files io.pathnames io.streams.string kernel
  lexer listener listener.private make math memoize namespaces
  parser prettyprint prettyprint.config quotations sequences sets
 -sorting source-files strings summary tools.vocabs vectors
 -vocabs vocabs.loader ;
 +sorting source-files strings tools.vocabs vectors vocabs
- vocabs.loader vocabs.parser ;
++vocabs.loader vocabs.parser summary ;
  
  IN: fuel