Clarify kind of conflict in merge-one-file helper