Fix up merge conflicts