Fix conflict

diff --cc extra/peg/peg.factor
index d6d573da796da3e2909b63b244cc425607d6d6f9,8621b43a7f65ace64362c78efd813c2d92d14c8c..68aab7d82043fc49f534df3ba83b93443584a990
--- 1/extra/peg/peg.factor
--- 2/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@@@ -11,7 -11,9 +11,11 @@@ USE: prettyprin
  TUPLE: parse-result remaining ast ;
  
  TUPLE: parser id compiled ;
 -M: parser equal? [ id>> ] 2apply = ;
 -M: parser hashcode* ( depth obj -- code )
 -  id>> hashcode* ;
++
 +M: parser equal? [ id>> ] bi@ = ;
++
++M: parser hashcode* id>> hashcode* ;
++
  C: <parser> parser
  
  SYMBOL: ignore