diff --git a/src/backend/backend.did b/src/backend/backend.did
index b828f90fc7..163627bd67 100644
--- a/src/backend/backend.did
+++ b/src/backend/backend.did
@@ -164,8 +164,5 @@ service : (Arg) -> {
   sign_prehash : (text) -> (text);
   sign_transaction : (SignRequest) -> (text);
   stats : () -> (Stats) query;
-<<<<<<< HEAD
   step_migration : () -> ();
-=======
->>>>>>> origin/main
 }
diff --git a/src/declarations/backend/backend.did b/src/declarations/backend/backend.did
index b828f90fc7..163627bd67 100644
--- a/src/declarations/backend/backend.did
+++ b/src/declarations/backend/backend.did
@@ -164,8 +164,5 @@ service : (Arg) -> {
   sign_prehash : (text) -> (text);
   sign_transaction : (SignRequest) -> (text);
   stats : () -> (Stats) query;
-<<<<<<< HEAD
   step_migration : () -> ();
-=======
->>>>>>> origin/main
 }
diff --git a/src/declarations/backend/backend.did.d.ts b/src/declarations/backend/backend.did.d.ts
index 474eac69a5..1076308099 100644
--- a/src/declarations/backend/backend.did.d.ts
+++ b/src/declarations/backend/backend.did.d.ts
@@ -178,10 +178,7 @@ export interface _SERVICE {
 	sign_prehash: ActorMethod<[string], string>;
 	sign_transaction: ActorMethod<[SignRequest], string>;
 	stats: ActorMethod<[], Stats>;
-<<<<<<< HEAD
 	step_migration: ActorMethod<[], undefined>;
-=======
->>>>>>> origin/main
 }
 export declare const idlFactory: IDL.InterfaceFactory;
 export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];
diff --git a/src/declarations/backend/backend.factory.certified.did.js b/src/declarations/backend/backend.factory.certified.did.js
index 20dd09094b..c37f6d90e5 100644
--- a/src/declarations/backend/backend.factory.certified.did.js
+++ b/src/declarations/backend/backend.factory.certified.did.js
@@ -191,12 +191,8 @@ export const idlFactory = ({ IDL }) => {
 		set_user_token: IDL.Func([UserToken], [], []),
 		sign_prehash: IDL.Func([IDL.Text], [IDL.Text], []),
 		sign_transaction: IDL.Func([SignRequest], [IDL.Text], []),
-<<<<<<< HEAD
 		stats: IDL.Func([], [Stats]),
 		step_migration: IDL.Func([], [], [])
-=======
-		stats: IDL.Func([], [Stats])
->>>>>>> origin/main
 	});
 };
 // @ts-ignore
diff --git a/src/declarations/backend/backend.factory.did.js b/src/declarations/backend/backend.factory.did.js
index 52d37d5821..463ba76de3 100644
--- a/src/declarations/backend/backend.factory.did.js
+++ b/src/declarations/backend/backend.factory.did.js
@@ -191,12 +191,8 @@ export const idlFactory = ({ IDL }) => {
 		set_user_token: IDL.Func([UserToken], [], []),
 		sign_prehash: IDL.Func([IDL.Text], [IDL.Text], []),
 		sign_transaction: IDL.Func([SignRequest], [IDL.Text], []),
-<<<<<<< HEAD
 		stats: IDL.Func([], [Stats], ['query']),
 		step_migration: IDL.Func([], [], [])
-=======
-		stats: IDL.Func([], [Stats], ['query'])
->>>>>>> origin/main
 	});
 };
 // @ts-ignore