11.1Srilligmake: "parse.mk" line 7: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts 21.1Srilligmake: Fatal errors encountered -- cannot continue 31.1Srilligmake: stopped in unit-tests 41.1Srilligexit status 1 5