diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
index cdb01898e7a57..251989e31e207 100644
--- a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
+++ b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
@@ -40,18 +40,13 @@ export namespace SearchInWorkspaceCommands {
         id: 'search-in-workspace.open',
         category: SEARCH_CATEGORY,
         label: 'Find in Files'
-<<<<<<< HEAD
     }, 'vscode/search.contribution/findInFiles', SEARCH_CATEGORY_KEY);
-    export const FIND_IN_FOLDER = Command.toLocalizedCommand({
-=======
-    };
-    export const REPLACE_IN_FILES: Command = {
+    export const REPLACE_IN_FILES = Command.toLocalizedCommand({
         id: 'search-in-workspace.replace',
         category: SEARCH_CATEGORY,
         label: 'Replace in Files'
-    };
-    export const FIND_IN_FOLDER: Command = {
->>>>>>> beac550c251 (Add 'replace in files' command)
+    }, 'vscode/searchActions/replaceInFiles', SEARCH_CATEGORY_KEY);
+    export const FIND_IN_FOLDER = Command.toLocalizedCommand({
         id: 'search-in-workspace.in-folder',
         category: SEARCH_CATEGORY,
         label: 'Find in Folder'
@@ -135,14 +130,6 @@ export class SearchInWorkspaceFrontendContribution extends AbstractViewContribut
             }
         });
 
-        commands.registerCommand(SearchInWorkspaceCommands.REPLACE_IN_FILES, {
-            isEnabled: () => this.workspaceService.tryGetRoots().length > 0,
-            execute: async () => {
-                const widget = await this.openView({ activate: true });
-                widget.updateSearchTerm(this.getSearchTerm(), true);
-            }
-        });
-
         commands.registerCommand(SearchInWorkspaceCommands.FIND_IN_FOLDER, this.newMultiUriAwareCommandHandler({
             execute: async uris => {
                 const resources: string[] = [];
@@ -232,12 +219,7 @@ export class SearchInWorkspaceFrontendContribution extends AbstractViewContribut
             commandId: SearchInWorkspaceCommands.FIND_IN_FOLDER.id
         });
         menus.registerMenuAction(CommonMenus.EDIT_FIND, {
-            commandId: SearchInWorkspaceCommands.OPEN_SIW_WIDGET.id,
-            order: '2'
-        });
-        menus.registerMenuAction(CommonMenus.EDIT_FIND, {
-            commandId: SearchInWorkspaceCommands.REPLACE_IN_FILES.id,
-            order: '3'
+            commandId: SearchInWorkspaceCommands.OPEN_SIW_WIDGET.id
         });
     }