completed the merge