diff --git a/pkg/controller/export/export_config_controller.go b/pkg/controller/export/export_config_controller.go
index a0ff7f258a3..c1efe9bc2a6 100644
--- a/pkg/controller/export/export_config_controller.go
+++ b/pkg/controller/export/export_config_controller.go
@@ -26,13 +26,8 @@ import (
 )
 
 var (
-<<<<<<< HEAD
 	ExportEnabled = flag.Bool("enable-pub-sub", false, "(alpha) Enabled pubsub to publish messages")
 	log           = logf.Log.WithName("controller").WithValues(logging.Process, "pubsub_controller")
-=======
-	ExportEnabled = flag.Bool("enable-pub-sub", false, "Enable export backend to publish messages")
-	log           = logf.Log.WithName("controller").WithValues(logging.Process, "export_controller")
->>>>>>> fixing errors
 )
 
 type Adder struct {
diff --git a/pkg/controller/export/export_config_controller_test.go b/pkg/controller/export/export_config_controller_test.go
index 8f4c599f8c8..791468a4c9c 100644
--- a/pkg/controller/export/export_config_controller_test.go
+++ b/pkg/controller/export/export_config_controller_test.go
@@ -48,7 +48,7 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 			wantErr:  true,
-			errorMsg: fmt.Sprintf("data missing in configmap %s, unable to configure respective driver", request.NamespacedName),
+			errorMsg: fmt.Sprintf("data missing in configmap %s, unable to establish connection", request.NamespacedName),
 		},
 	}
 	for _, tc := range testCases {