Update master.yml

.github/workflows/master.yml

-name: Build and Push to ACR
 
+<<<<<<< HEAD
 on:
   push:
     ### Production
@@ -61,12 +61,19 @@ jobs:
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
           ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
       ### Production
+=======
+>>>>>>> f6ab32a (Update master.yml)
       - name: Commit and Push
         run: |
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
+<<<<<<< HEAD
           git add .
           git commit -m "Generated Image New Tag"
           git push origin master
 >>>>>>> 9ec03fb (Update master.yml)
+=======
+          git commit -am "generated Image update"
+          git push origin develop
+>>>>>>> f6ab32a (Update master.yml)