Add check for merge conflict markers