Last of the merge conflict fixes