chore: resolve conflicts

.github/workflows/papyrus_ci.yml

@@ -123,7 +123,6 @@ jobs:
         env:
           SEED: 0
 
-<<<<<<< HEAD
   codecov:
     runs-on: starkware-ubuntu-latest-medium
     steps:
@@ -153,38 +152,6 @@ jobs:
           fail_ci_if_error: true
           version: "v0.1.15"
 
-||||||| ce118c17
-  codecov:
-    runs-on: starkware-ubuntu-latest-medium
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
-      - name: Set-Up
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang llvm libudev-dev
-      - uses: Noelware/setup-protoc@1.1.0
-        with:
-          version: ${{env.PROTOC_VERSION}}
-
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-      - uses: Swatinem/rust-cache@v2
-      - run: npm install -g ganache@7.4.3
-      - name: Coverage
-        run: cargo llvm-cov --codecov -r --output-path codecov.json
-        env:
-          SEED: 0
-      - name: Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true
-          fail_ci_if_error: true
-          version: "v0.1.15"
-
-=======
->>>>>>> origin/main-v0.13.2
   check-starknet_api-dependency:
     runs-on: starkware-ubuntu-latest-small
     if: github.base_ref == 'main' # this step is only run if the pr is to the main branch

Cargo.toml

@@ -172,15 +172,9 @@ simple_logger = "4.0.0"
 starknet-core = "0.6.0"
 starknet-crypto = "0.5.1"
 starknet-types-core = { version = "0.1.5", features = ["hash", "prime-bigint", "std"] }
-<<<<<<< HEAD
-starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.0" }
+starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.1" }
 starknet_batcher = { path = "crates/batcher", version = "0.0" }
 starknet_batcher_types = { path = "crates/batcher_types", version = "0.0" }
-||||||| ce118c17
-starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.0" }
-=======
-starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.1" }
->>>>>>> origin/main-v0.13.2
 starknet_client = { path = "crates/starknet_client", version = "0.4.0-rc.0" }
 starknet_committer = { path = "crates/starknet_committer", version = "0.1.0-rc.0" }
 starknet_consensus_manager = { path = "crates/consensus_manager", version = "0.0" }