diff --git a/packages/_vue3-migration-test/src/x-modules/index.ts b/packages/_vue3-migration-test/src/x-modules/index.ts
index 744c1107ce..f45462a466 100644
--- a/packages/_vue3-migration-test/src/x-modules/index.ts
+++ b/packages/_vue3-migration-test/src/x-modules/index.ts
@@ -5,8 +5,5 @@ export * from './search';
 export * from './search-box';
 export { default as TestElementsList } from './test-elements-list.vue';
 export * from './scroll';
-<<<<<<< feat/EMP-4163-migrate-query-suggestions-module-to-composition-api
-export * from './query-suggestions';
-=======
 export * from './history-queries';
->>>>>>> main
+export * from './query-suggestions';