resolve merge conflict in machine controller

pkg/templates/images/images.go

@@ -213,7 +213,7 @@ func baseResources() map[Resource]map[string]string {
 		CalicoNode:             {"*": "quay.io/calico/node:v3.28.0"},
 		DNSNodeCache:           {"*": "registry.k8s.io/dns/k8s-dns-node-cache:1.23.1"},
 		Flannel:                {"*": "docker.io/flannel/flannel:v0.21.3"}, // TBD I am assuming, flannel is being skipped for updates? It has not been updated for a long time and is not part of the official checklist
-		MachineController:      {"*": "quay.io/kubermatic/machine-controller:v1.59.1"},
+		MachineController:      {"*": "quay.io/kubermatic/machine-controller:d62ab03c71afd83c2d13549b06f85bd4621ef186"},
 		MetricsServer:          {"*": "registry.k8s.io/metrics-server/metrics-server:v0.7.1"},
 		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.5.2"},
 	}