Resolve additional conflicts

Author: shaun-nx

operators/Makefile

@@ -49,11 +49,7 @@ run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/c
 
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
-<<<<<<< HEAD
-	docker build -f Dockerfile -t ${IMG} ..
-=======
 	docker build --platform linux/$(ARCH) -f Dockerfile -t ${IMG} ..
->>>>>>> feat/openshift-support
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
@@ -93,11 +89,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 	$(KUSTOMIZE) build config/default | kubectl delete -f -
 
 OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-<<<<<<< HEAD
-ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
-=======
 ARCH ?= $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
->>>>>>> feat/openshift-support
 
 .PHONY: kustomize
 KUSTOMIZE = $(shell pwd)/bin/kustomize

operators/README.md

@@ -63,11 +63,7 @@ For complete configuration options, see the [Helm Chart Documentation](https://g
 ### Building and Testing the Operator Locally
 
 ```bash
-<<<<<<< HEAD
-# Build the operator image
-=======
 # Build the operator image. If building for deploying on a cluster with different architecture from your local machine, append ARCH=<targetarch> e.g. `ARCH=amd64` to the below command
->>>>>>> feat/openshift-support
 make docker-build IMG=<your-registry>/nginx-gateway-fabric-operator:<tag>
 
 # Push the image