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