Finished the merge