Changed a file to cause merge conflict