making a merge conflict on purpose