Add checks for Merge conflicts left in code in linting.

[generalredneck]

for commits like this one that broke the build