fix conflicts remnants

Author: senyosimpson

deploy/cr.yaml

@@ -320,17 +320,13 @@ spec:
   backups:
 #    trackLatestRestorableTime: true
     pgbackrest:
-<<<<<<< HEAD
       # Optional: Sets a grace period in seconds before the first backup is performed
       # after PostgreSQL initialization. This helps prevent backup failures that can
       # occur when the backup starts before PostgreSQL is fully ready.
       # initialBackupDelaySeconds: 120
-      image: percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
-=======
 #      metadata:
 #        labels:
       image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
->>>>>>> upstream/release-2.6.0
 #
 #      containers:
 #        pgbackrest:

percona/controller/pgcluster/testutils_test.go

@@ -120,11 +120,7 @@ func readDefaultCR(name, namespace string) (*v2.PerconaPGCluster, error) {
 	if cr.Annotations == nil {
 		cr.Annotations = make(map[string]string)
 	}
-<<<<<<< HEAD
-	cr.Annotations[pNaming.InternalAnnotationDisablePatroniVersionCheck] = "true"
-=======
 	cr.Annotations[pNaming.AnnotationCustomPatroniVersion] = "4.0.0"
->>>>>>> upstream/release-2.6.0
 	cr.Namespace = namespace
 	cr.Status.Postgres.Version = cr.Spec.PostgresVersion
 	return cr, nil