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