try deploying branch

ci/push.template.yml

@@ -5,7 +5,7 @@
         - NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
         - docker push ${NAME}:${IMAGE_TAG}
     rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/ || $CI_COMMIT_BRANCH == "conflict_check"'
           variables:
             IMAGE_TAG: $CI_COMMIT_BRANCH
           changes: