merge-one-file: force content conflict for "both sides added" case