finished the merge