diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
index 103f681e..db05ea74 100644
--- a/api/v1alpha1/common.go
+++ b/api/v1alpha1/common.go
@@ -100,7 +100,6 @@ type Pvc struct {
 	StorageClass string `json:"storageClass,omitempty"`
 }
 
-<<<<<<< HEAD
 type Auth struct {
 	// Environmental variables used to define authentication parameters
 	//+optional
@@ -108,7 +107,8 @@ type Auth struct {
 	// Secret ref to be mounted inside a pod, Mount path defaults to /var/run/secrets/tas/auth
 	//+optional
 	SecretMount []SecretKeySelector `json:"secretMount,omitempty"`
-=======
+}
+
 // TLSCert defines fields for TLS certificate
 // +kubebuilder:validation:XValidation:rule=(!has(self.certRef) || has(self.privateKeyRef)),message=privateKeyRef cannot be empty
 type TLSCert struct {
@@ -121,5 +121,4 @@ type TLSCert struct {
 	// Reference to CA certificate
 	//+optional
 	CACertRef *LocalObjectReference `json:"CACertRef,omitempty"`
->>>>>>> 8dc3af9 (Add TLS to Rekor and Trillian services)
 }
diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
index 98c47896..480a6d85 100644
--- a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
@@ -92,8 +92,8 @@ metadata:
                 "OIDCIssuers": [
                   {
                     "ClientID": "trusted-artifact-signer",
-                    "Issuer": "https://keycloak-keycloak-system.apps.rosa.ebh6v-tpwpi-a4f.ohpr.p3.openshiftapps.com/auth/realms/trusted-artifact-signer",
-                    "IssuerURL": "https://keycloak-keycloak-system.apps.rosa.ebh6v-tpwpi-a4f.ohpr.p3.openshiftapps.com/auth/realms/trusted-artifact-signer",
+                    "Issuer": "https://your-oidc-issuer-url",
+                    "IssuerURL": "https://your-oidc-issuer-url",
                     "Type": "email"
                   }
                 ]