fix: ci

Author: will-break-it

.github/workflows/ci.yaml

@@ -15,10 +15,7 @@ on:
       - "data/**"
       - "site/**"
       - "docs/**"
-<<<<<<< HEAD
       - "cabal.project"
-=======
->>>>>>> main
   push:
     branches:
       - main
@@ -29,10 +26,7 @@ on:
       - "data/**"
       - "site/**"
       - "docs/**"
-<<<<<<< HEAD
       - "cabal.project"
-=======
->>>>>>> main
 
 jobs:
   ################################################################################
@@ -41,13 +35,9 @@ jobs:
   formal-spec-typecheck:
     name: "formal-spec: Typecheck"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       contains(github.event.commits.*.modified, 'formal-spec/') ||
       github.event_name == 'pull_request' &&
-=======
-      github.event_name == 'push' ||
->>>>>>> main
       contains(github.event.pull_request.files.*.path, 'formal-spec/')
     runs-on: ubuntu-22.04
     steps:
@@ -92,7 +82,6 @@ jobs:
   simulation-test:
     name: "simulation: Test on ${{ matrix.os }} with GHC ${{ matrix.ghc-version }}"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       (contains(github.event.commits.*.modified, 'simulation/') ||
       contains(github.event.commits.*.modified, 'data/') ||
@@ -101,11 +90,6 @@ jobs:
       (contains(github.event.pull_request.files.*.path, 'simulation/') ||
       contains(github.event.pull_request.files.*.path, 'data/') ||
       contains(github.event.pull_request.files.*.path, 'cabal.project'))
-=======
-      github.event_name == 'push' ||
-      contains(github.event.pull_request.files.*.path, 'simulation/') ||
-      contains(github.event.pull_request.files.*.path, 'data/')
->>>>>>> main
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -173,7 +157,6 @@ jobs:
   simulation-hlint:
     name: "simulation: Check with HLint"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       (contains(github.event.commits.*.modified, 'simulation/') ||
       contains(github.event.commits.*.modified, 'data/') ||
@@ -182,11 +165,6 @@ jobs:
       (contains(github.event.pull_request.files.*.path, 'simulation/') ||
       contains(github.event.pull_request.files.*.path, 'data/') ||
       contains(github.event.pull_request.files.*.path, 'cabal.project'))
-=======
-      github.event_name == 'push' ||
-      contains(github.event.pull_request.files.*.path, 'simulation/') ||
-      contains(github.event.pull_request.files.*.path, 'data/')
->>>>>>> main
     runs-on: ubuntu-22.04
     steps:
       - name: 📥 Checkout repository
@@ -204,7 +182,6 @@ jobs:
   simulation-fourmolu:
     name: "simulation: Check with fourmolu"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       (contains(github.event.commits.*.modified, 'simulation/') ||
       contains(github.event.commits.*.modified, 'data/') ||
@@ -213,11 +190,6 @@ jobs:
       (contains(github.event.pull_request.files.*.path, 'simulation/') ||
       contains(github.event.pull_request.files.*.path, 'data/') ||
       contains(github.event.pull_request.files.*.path, 'cabal.project'))
-=======
-      github.event_name == 'push' ||
-      contains(github.event.pull_request.files.*.path, 'simulation/') ||
-      contains(github.event.pull_request.files.*.path, 'data/')
->>>>>>> main
     runs-on: ubuntu-22.04
     steps:
       - name: 📥 Checkout repository
@@ -235,18 +207,12 @@ jobs:
   sim-rs-check:
     name: "sim-rs: Test"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       (contains(github.event.commits.*.modified, 'sim-rs/') ||
       contains(github.event.commits.*.modified, 'data/')) ||
       github.event_name == 'pull_request' &&
       (contains(github.event.pull_request.files.*.path, 'sim-rs/') ||
       contains(github.event.pull_request.files.*.path, 'data/'))
-=======
-      github.event_name == 'push' ||
-      contains(github.event.pull_request.files.*.path, 'sim-rs/') ||
-      contains(github.event.pull_request.files.*.path, 'data/')
->>>>>>> main
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -266,13 +232,9 @@ jobs:
   docs-generate-d2-diagrams:
     name: "docs: Generate D2 Diagrams"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       endsWith(github.event.commits.*.modified, '.d2') ||
       github.event_name == 'pull_request' &&
-=======
-      github.event_name == 'push' ||
->>>>>>> main
       endsWith(github.event.pull_request.files.*.path, '.d2')
     runs-on: ubuntu-22.04
     permissions:
@@ -334,13 +296,9 @@ jobs:
   docs-build:
     name: "docs: Build"
     if: |
-<<<<<<< HEAD
       github.event_name == 'push' &&
       contains(github.event.commits.*.modified, 'site/') ||
       github.event_name == 'pull_request' &&
-=======
-      github.event_name == 'push' ||
->>>>>>> main
       contains(github.event.pull_request.files.*.path, 'site/')
     runs-on: ubuntu-22.04
     outputs: