diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index cb939c2e84..2a90efc0ba 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -274,13 +274,9 @@ export const scaffolderTranslationRef: TranslationRef<
     readonly 'ongoingTask.showLogsButtonTitle': 'Show Logs';
     readonly 'templateEditorForm.stepper.emptyText': 'There are no spec parameters in the template to preview.';
     readonly 'templateTypePicker.title': 'Categories';
-<<<<<<< HEAD:plugins/scaffolder/report-alpha.api.md
     readonly 'templateFormPage.title': 'Template Form Playground';
     readonly 'templateFormPage.subtitle': 'Edit, preview, and try out templates and template forms';
-    readonly 'templateEditorPage.title': 'Template Editor';
-=======
     readonly 'templateEditorPage.title': 'Manage Templates';
->>>>>>> 0d22ec434749 (scaffolder: Rework manage templates page):plugins/scaffolder/api-report-alpha.md
     readonly 'templateEditorPage.subtitle': 'Edit, preview, and try out templates and template forms';
     readonly 'templateEditorPage.dryRunResults.title': 'Dry-run results';
     readonly 'templateEditorPage.dryRunResultsList.title': 'Result {{resultId}}';