Finish cleaning up any merge conflicts