Fix conflict

diff --cc core/sequences/sequences.factor
index e5c6b5ad994345e6e4fe4607c9b37677f2bf3a06,563a3ed5b0cc20a27b8191ae4cef19bf3b857199..df79069898741e991d74eaf6a2083e002cb488d5
--- 1/core/sequences/sequences.factor
--- 2/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@@ -739,10 -739,10 +739,10 @@@ PRIVATE
      [ but-last ] [ peek ] bi ;
  
  : unclip-slice ( seq -- rest first )
 -    [ rest-slice ] [ first ] bi ;
 +    [ rest-slice ] [ first ] bi ; inline
  
- : unclip-last-slice ( seq -- butfirst last )
+ : unclip-last-slice ( seq -- butlast last )
 -    [ but-last-slice ] [ peek ] bi ;
 +    [ but-last-slice ] [ peek ] bi ; inline
  
  : <flat-slice> ( seq -- slice )
      dup slice? [ { } like ] when 0 over length rot <slice> ;