merge conflict gone