Fix up merge conflict