completing the merge