Changed a file to cause a merge conflict