diff --git a/internal/controller/state.go b/internal/controller/state.go
index 807e7911..c08e38c8 100644
--- a/internal/controller/state.go
+++ b/internal/controller/state.go
@@ -38,13 +38,9 @@ func (clctrl *ClusterController) StateStoreCredentials() error {
 	}
 
 	var stateStoreData pkgtypes.StateStoreCredentials
-<<<<<<< HEAD
-	telemetry.SendEvent(clctrl.SegmentClient, telemetry.StateStoreCredentialsCreateStarted, "")
-=======
 	segClient := segment.InitClient()
 	defer segClient.Client.Close()
 	telemetry.SendEvent(segClient, telemetry.StateStoreCredentialsCreateStarted, "")
->>>>>>> eeb0e87e1ac5c48d1a7c29dda4c700b382811a7c
 
 	if !cl.StateStoreCredsCheck {
 		switch clctrl.CloudProvider {