Fixed issue #69: Add a check for merge conflict markers in YAML files