try resolving conflicts

.github/workflows/unit-and-integration-tests-unified.yml

@@ -157,26 +157,6 @@ jobs:
           echo ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}
           docker save "${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}" | gzip > druid-container-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}.tar.gz    
 
-#  unit-tests-phase2:
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429
-#        jdk: [ '11', '21.0.4' ]
-#    name: "unit tests (jdk${{ matrix.jdk }})"
-#    uses: ./.github/workflows/unit-tests.yml
-#    needs: unit-tests
-#    if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }}
-#    with:
-#      jdk: ${{ matrix.jdk }}
-
-#  unit-tests:
-#    name: "unit tests (jdk17)"
-#    uses: ./.github/workflows/unit-tests.yml
-#    needs: build
-#    with:
-#      jdk: 17
-
   standard-its:
     needs: build
     uses: ./.github/workflows/standard-its.yml