Fixes merge conflict and updates clippy check

.github/workflows/ci.yml

@@ -13,7 +13,16 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Check Cargo Clippy
-        run: cargo clippy --all-targets --all-features
+      - name: Update Rust toolchain
+        run: actions-rust-lang/setup-rust-toolchain@v1
       - name: Check formatting
         run: cargo fmt --check --all
+
+  clippy:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check Clippy
+        run: cargo clippy --all-targets --all-features --workspace -- -D warnings
+