fixed merge conflicts in makefile.  continuing work to switch coverage tool to istanbul.