Done with the merge