updating the merge conflict