resolve merge conflict

Author: rlieberman-splunk

.github/workflows/automated-release-workflow.yml

@@ -101,7 +101,11 @@ jobs:
 
     - name: Promote RC Image to Release
       run: |
+<<<<<<< HEAD
         docker tag ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}
+=======
+        docker tag splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}
+>>>>>>> ada76d566b7bc359476aecad185349cac7a6ff52
         docker tag splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} splunk/splunk-operator:latest
 
     - name: Push Release Image