merge conflict gone wrong