diff --git a/app/client/cli/debug.go b/app/client/cli/debug.go
index 751dfd75e..6fa53aaa9 100644
--- a/app/client/cli/debug.go
+++ b/app/client/cli/debug.go
@@ -23,7 +23,6 @@ const (
 	PromptSendBlockRequest       string = "BlockRequest (broadcast)"
 )
 
-<<<<<<< HEAD
 var items = []string{
 	PromptPrintNodeState,
 	PromptTriggerNextView,
@@ -40,30 +39,6 @@ func init() {
 	rootCmd.AddCommand(dbgUI)
 }
 
-=======
-var (
-	items = []string{
-		PromptPrintNodeState,
-		PromptTriggerNextView,
-		PromptTogglePacemakerMode,
-		PromptResetToGenesis,
-		PromptShowLatestBlockInStore,
-		PromptSendMetadataRequest,
-		PromptSendBlockRequest,
-	}
-)
-
-func init() {
-	dbgUI := newDebugUICommand()
-	dbgUI.AddCommand(newDebugUISubCommands()...)
-	rootCmd.AddCommand(dbgUI)
-
-	dbg := newDebugCommand()
-	dbg.AddCommand(debugCommands()...)
-	rootCmd.AddCommand(dbg)
-}
-
->>>>>>> main
 // newDebugUISubCommands builds out the list of debug subcommands by matching the
 // handleSelect dispatch to the appropriate command.
 // * To add a debug subcommand, you must add it to the `items` array and then
@@ -74,7 +49,7 @@ func newDebugUISubCommands() []*cobra.Command {
 		commands[idx] = &cobra.Command{
 			Use:               promptItem,
 			PersistentPreRunE: helpers.P2PDependenciesPreRunE,
-			Run: func(cmd *cobra.Command, args []string) {
+			Run: func(cmd *cobra.Command, _ []string) {
 				handleSelect(cmd, cmd.Use)
 			},
 			ValidArgs: items,