Fix up merge derps