Fix the last of the merge conflicts