force a merge conflict