Resolve conflicts

Removed several steps related to path dependencies and Zepter checks from the release workflow.

Author: EgorPopelyaev

.github/workflows/release-60_post-crates-release-activities.yml

@@ -178,84 +178,6 @@ jobs:
 
           reorder_prdocs "$VERSION"
 
-<<<<<<< HEAD
-      - name: Replace path dependencies
-        run: |
-          echo "Running replace-all-path-deps.sh..."
-          bash scripts/release/replace-all-path-deps.sh
-
-          # Show git diff to see what changed
-          git diff --stat
-
-      - name: Remove versions where path deps are present
-        run: |
-          echo "Running delete-versions-if-path-is-present.sh..."
-          bash scripts/release/delete-versions-if-path-is-present.sh
-
-          # Show git diff to see what changed
-          git diff --stat
-
-      - name: Remove version from umbrella/Cargo.toml
-        run: |
-          echo "Running delete-version-from-umbrella.sh..."
-          bash scripts/release/delete-version-from-umbrella.sh
-
-          # Show git diff to see what changed
-          git diff --stat
-
-      - name: Run Zepter - check issues
-        run: |
-          echo "Running zepter run check to identify issues..."
-          zepter run check || echo "Zepter found issues that need to be fixed"
-
-      - name: Run Zepter - fix issues
-        run: |
-          echo "Running zepter to fix issues..."
-          zepter || echo "Zepter fix completed"
-          # Show git diff to see what changed
-          git diff --stat
-
-      - name: Run Zepter - verify fixes
-        run: |
-          echo "Running zepter run check again to verify fixes..."
-          zepter run check || echo "There are still issues to fix manually"
-
-      - name: Run taplo - check formatting
-        run: |
-          echo "Running taplo format check..."
-          taplo format --check --config .config/taplo.toml || echo "Taplo found formatting issues"
-
-      - name: Run taplo - format
-        run: |
-          echo "Running taplo format..."
-          taplo format --config .config/taplo.toml
-          # Show git diff to see what changed
-          git diff --stat
-
-      - name: Run taplo - verify formatting
-        run: |
-          echo "Running taplo format check again..."
-          taplo format --check --config .config/taplo.toml || echo "There are still formatting issues"
-
-      - name: Install Python dependencies
-        run: |
-          echo "Installing Python dependencies..."
-          pip3 install toml "cargo-workspace>=1.2.6"
-
-      - name: Run workspace check
-        run: |
-          echo "Running workspace check..."
-          python3 .github/scripts/check-workspace.py . --exclude \
-            "substrate/frame/contracts/fixtures/build" \
-            "substrate/frame/contracts/fixtures/contracts/common"
-
-      - name: Deny git dependencies
-        run: |
-          echo "Checking for git dependencies..."
-          python3 .github/scripts/deny-git-deps.py .
-
-=======
->>>>>>> 387a7e21 ([Release|CI/CD] Add `parity-publish restore` step to simplify post crates release activity (#11652))
       - name: Check git status before commit
         run: |
           echo "=== Git status ==="