diff --git a/controllers/mysql_container.go b/controllers/mysql_container.go
index a8463b35..f6d86d63 100644
--- a/controllers/mysql_container.go
+++ b/controllers/mysql_container.go
@@ -133,10 +133,13 @@ func (r *MySQLClusterReconciler) makeV1AgentContainer(cluster *mocov1beta2.MySQL
 	}
 	if cluster.Spec.LogRotationSchedule != "" {
 		c.WithArgs("--log-rotation-schedule", cluster.Spec.LogRotationSchedule)
+<<<<<<< HEAD
 	}
 
 	if cluster.Spec.AgentUseLocalhost {
 		c.WithArgs(constants.MocoMySQLDLocalhostFlag, strconv.FormatBool(cluster.Spec.AgentUseLocalhost))
+=======
+>>>>>>> parent of 403eb1a... Fix init container arguments
 	}
 
 	c.WithVolumeMounts(