Add a change that will cause a merge conflict