Add check for merge conflict markers

This checks for unresolved merge conflict markers in the files being committed.

Open for discussion.