changes to cause merge conflict