Cleaning up the merge