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