fixed conflicts

Dockerfile

@@ -2,11 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=latest
 
-<<<<<<< HEAD
-FROM minio/mc:RELEASE.2021-06-13T17-48-22Z as base
-=======
 FROM minio/mc:RELEASE.2021-07-27T06-46-19Z as base
->>>>>>> origin/development
 
 FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
 

hardening_manifest.yaml

@@ -8,11 +8,7 @@ name: "opensource/minio/mc"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-<<<<<<< HEAD
-- "RELEASE.2021-06-13T17-48-22Z"
-=======
 - "RELEASE.2021-07-27T06-46-19Z"
->>>>>>> origin/development
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -31,11 +27,7 @@ labels:
   org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html"
   # Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "MinIO"
-<<<<<<< HEAD
-  org.opencontainers.image.version: "RELEASE.2021-06-13T17-48-22Z"
-=======
   org.opencontainers.image.version: "RELEASE.2021-07-27T06-46-19Z"
->>>>>>> origin/development
   # Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "utilities"
   # This value can be "opensource" or "commercial"
@@ -45,13 +37,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-<<<<<<< HEAD
-- tag: minio/mc:RELEASE.2021-06-13T17-48-22Z
-  url: docker://docker.io/minio/mc@sha256:bfd7b4c7751014233570e3fae765ccb7c65ac9e6346bd6effe6cfb1aa9ee6fc0
-=======
 - tag: minio/mc:RELEASE.2021-07-27T06-46-19Z
   url: docker://docker.io/minio/mc@sha256:4ee74e7e471a39bc695907b7a4f06ae273fd660a1d919253308d1f0566de7a14
->>>>>>> origin/development
 
 # List of project maintainers
 maintainers: