unit-tests/parse.exp

   1 make: "parse.mk" line 7: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
   2 make: "parse.mk" line 14: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
   3 make: Fatal errors encountered -- cannot continue
   4 make: stopped in unit-tests
   5 exit status 1