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.
@segiddins: That's the drawback. We're *reading* it twice in any case.
We should use `File.open(path).each_line` to read the file really line-wise.
This would optimize the memory consumption.