Fix merge conflicts.

.github/workflows/ruff.yaml

@@ -1,22 +1,24 @@
 name: Ruff Formatting & Linting
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
-  ruff:
-    name: Run Ruff Checks
+  build:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Run Ruff (Lint & Format Check)
-        uses: astral-sh/ruff-action@v1
+      - uses: actions/checkout@v4
+      - name: Install Python
+        uses: actions/setup-python@v5
         with:
-          args: "check . --output-format=concise"
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
 
-      - name: Run Ruff Format Check
-        uses: astral-sh/ruff-action@v1
-        with:
-          args: "format --check ."
+      - name: Run Ruff
+        run: ruff check --output-format=github . && ruff format --check