Fix merge conflicts

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

config/base/catalogd/rbac/standard/role.yaml

@@ -35,7 +35,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: manager-role
-  namespace: system
+  namespace: olmv1-system
 rules:
 - apiGroups:
   - ""

config/base/operator-controller/rbac/standard/role.yaml

@@ -62,7 +62,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: manager-role
-  namespace: system
+  namespace: olmv1-system
 rules:
 - apiGroups:
   - ""