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: "parse.mk" line 24: Invalid line type 4make: Fatal errors encountered -- cannot continue 5make: stopped in unit-tests 6exit status 1 7