check for merge conflicts

coloring doesn't seem to work on Travis (it doesn't harm either), but
should on a plain Linux or Mac shell prompt
Merge pull request #990 from Jojo-Schmitz/check-for-merge-conflicts

check for merge conflicts