diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml
index 654ed08b..8fc53041 100644
--- a/.github/workflows/rust-next.yml
+++ b/.github/workflows/rust-next.yml
@@ -11,12 +11,8 @@ env:
   RUST_BACKTRACE: 1
   CARGO_TERM_COLOR: always
   CLICOLOR: 1
-<<<<<<< HEAD
   COLUMNS: 130
-||||||| e4f2b351
-=======
   CARGO_INCREMENTAL: 0
->>>>>>> _rust/main
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
@@ -41,16 +37,6 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
-<<<<<<< HEAD
-        toolchain: ${{ matrix.rust }}
-        components: rustfmt
-    - uses: Swatinem/rust-cache@v2
-    - uses: taiki-e/install-action@cargo-hack
-||||||| e4f2b351
-        toolchain: ${{ matrix.rust }}
-    - uses: Swatinem/rust-cache@v2
-    - uses: taiki-e/install-action@cargo-hack
-=======
         persist-credentials: false
     - name: Install Rust
       run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
@@ -60,7 +46,6 @@ jobs:
       uses: taiki-e/install-action@37f7c5781271959fb65b6b35224e28652ff2b63d  # v2.87.0
       with:
         tool: cargo-hack
->>>>>>> _rust/main
     - name: Build
       run: cargo test --workspace --no-run
     - name: Test
@@ -77,16 +62,6 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
-<<<<<<< HEAD
-        toolchain: stable
-        components: rustfmt
-    - uses: Swatinem/rust-cache@v2
-    - uses: taiki-e/install-action@cargo-hack
-||||||| e4f2b351
-        toolchain: stable
-    - uses: Swatinem/rust-cache@v2
-    - uses: taiki-e/install-action@cargo-hack
-=======
         persist-credentials: false
     - name: Install Rust
       run: rustup update --no-self-update stable && rustup default stable
@@ -96,7 +71,6 @@ jobs:
       uses: taiki-e/install-action@37f7c5781271959fb65b6b35224e28652ff2b63d  # v2.87.0
       with:
         tool: cargo-hack
->>>>>>> _rust/main
     - name: Update dependencies
       run: cargo update
     - name: Build