Cleaning up the merge conflicts