Creating merge conflict to show diffmerge capabilities.