diff --git a/ignite/cmd/chain_debug.go b/ignite/cmd/chain_debug.go
index caac19cf6c..f7bd847dcd 100644
--- a/ignite/cmd/chain_debug.go
+++ b/ignite/cmd/chain_debug.go
@@ -100,15 +100,8 @@ func chainDebug(cmd *cobra.Command, session *cliui.Session) error {
 		chain.KeyringBackend(chaincmd.KeyringBackendTest),
 	}
 
-<<<<<<< HEAD
-	config, err := cmd.Flags().GetString(flagConfig)
-	if err != nil {
-		return err
-	}
-=======
 	// check if custom config is defined
 	config, _ := cmd.Flags().GetString(flagConfig)
->>>>>>> 16a40f0a (fix(cmd): add missing --config handling (#4323))
 	if config != "" {
 		chainOptions = append(chainOptions, chain.ConfigFile(config))
 	}