Skipped merge conflict