Bad merge conflict