Recognize merge conflicts

Fail pre-emptively on merge conflicts, because they happen very often in Xcode projects due their nature, and the resulting error would depend on the position of the conflict marks.
Ok, then we need a version of `plist_xml_contents` that takes a straight string to convert.