Fixup conflicts that were inadvertently merged