finishing the merge