Fix the rest of the merge conflicts.