@@ -68,13 +68,33 @@ jobs:
             exe-suffix: ".exe"
             dune-profile: release
 
+<<<<<<< HEAD
           # Disable for now. eio and eio_main require ocaml >= 5.2.0
           # Verify that the compiler still builds with the oldest OCaml version we support.
           # - os: ubuntu-24.04
           #   ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
           #   node-target: linux-x64
           #   rust-target: x86_64-unknown-linux-musl
           #   dune-profile: static
+||||||| 5ec125a91
+          # Verify that the compiler still builds with older OCaml versions
+          - os: ubuntu-latest
+            ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
+          - os: ubuntu-latest
+            ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
+          - os: ubuntu-latest
+            ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static
+=======
+          # Verify that the compiler still builds with the oldest OCaml version we support.
+          # Steps comparing OCaml and Rust rewatch are skipped on this job; the
+          # first linux-x64 job runs them. OCaml 5.0 does not build with GCC 15
+          # (C23 by default), so this job stays on Ubuntu 24.04.
+          - os: ubuntu-24.04
+            ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
+            node-target: linux-x64
+            rust-target: x86_64-unknown-linux-musl
+            dune-profile: static
+>>>>>>> master
 
     runs-on: ${{matrix.os}}
 
@@ -98,6 +118,7 @@ jobs:
 
       - name: Setup Linux dependencies
         if: runner.os == 'Linux'
+<<<<<<< HEAD
         uses: ./.github/actions/setup-linux-dependencies
 
       - name: Build rewatch
@@ -107,22 +128,143 @@ jobs:
           rust-target: ${{ matrix.rust-target }}
           exe-suffix: ${{ matrix.exe-suffix }}
           run-quality-checks: "true"
+||||||| 5ec125a91
+        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        with:
+          # See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
+          packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
+          version: v2
+=======
+        uses: ./.github/actions/setup-linux-dependencies
+>>>>>>> master
 
+<<<<<<< HEAD
       # The static OCaml switch uses musl-gcc. linux-libc-dev installs Linux
       # headers under /usr/include, but musl-gcc searches the musl include dir.
       # Link the Linux headers into musl's include path so packages with C stubs
       # such as uring can include <linux/...> headers.
       - name: Make Linux headers visible to musl-gcc
         if: runner.os == 'Linux'
+||||||| 5ec125a91
+      # matrix.ocaml_compiler may contain commas
+      - name: Get OPAM cache key
+        shell: bash
+        run: echo "opam_cache_key=opam-env-v5-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+
+      - name: Restore OPAM environment
+        id: cache-opam-env
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ${{ runner.tool_cache }}/opam
+            ~/.opam
+            _opam
+            .opam-path
+            D:\cygwin
+            D:\.opam
+          key: ${{ env.opam_cache_key }}
+
+      - name: Use OCaml ${{matrix.ocaml_compiler}}
+        uses: ocaml/setup-ocaml@v3.0.15
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        with:
+          ocaml-compiler: ${{matrix.ocaml_compiler}}
+          opam-pin: false
+
+      - name: Get OPAM executable path
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const opamPath = await io.which('opam', true);
+            console.log('opam executable found: %s', opamPath);
+
+            const fs = require('fs/promises');
+            await fs.writeFile('.opam-path', opamPath, 'utf-8');
+            console.log('stored path to .opam-path');
+
+      - name: Install OPAM dependencies
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        run: opam install . --deps-only --with-test
+
+      - name: Cache OPAM environment
+        if: steps.cache-opam-env.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ runner.tool_cache }}/opam
+            ~/.opam
+            _opam
+            .opam-path
+            D:\cygwin
+            D:\.opam
+          key: ${{ env.opam_cache_key }}
+
+      - name: Use cached OPAM environment
+        if: steps.cache-opam-env.outputs.cache-hit == 'true'
+=======
+      - name: Build rewatch
+        uses: ./.github/actions/build-rewatch
+        with:
+          cache-target: ${{ matrix.rust-target }}
+          rust-target: ${{ matrix.rust-target }}
+          exe-suffix: ${{ matrix.exe-suffix }}
+          run-quality-checks: "true"
+
+      - name: Setup OCaml ${{ matrix.ocaml_compiler }}
+        id: setup_ocaml
+        uses: ./.github/actions/setup-ocaml
+        with:
+          compiler: ${{ matrix.ocaml_compiler }}
+          os: ${{ matrix.os }}
+          cache-prefix: opam-env-v9
+
+      - name: Compiler build state key
+        id: compiler-build-state-key
+        shell: bash
+>>>>>>> master
         run: |
+<<<<<<< HEAD
           set -eux
+||||||| 5ec125a91
+          # https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/installer.ts#L33
+          echo "OPAMVERBOSE=$RUNNER_DEBUG"   >> "$GITHUB_ENV"
+          echo "OPAMCOLOR=always"            >> "$GITHUB_ENV"
+          echo "OPAMCONFIRMLEVEL=unsafe-yes" >> "$GITHUB_ENV"
+          echo "OPAMERRLOGLEN=0"             >> "$GITHUB_ENV"
+          echo "OPAMPRECISETRACKING=1"       >> "$GITHUB_ENV"
+          echo "OPAMYES=1"                   >> "$GITHUB_ENV"
+=======
+          echo "value=compiler-build-state-v1-${{ matrix.os }}-${{ steps.setup_ocaml.outputs.setup_version }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" \
+            | sed 's/,/-/g' >> "$GITHUB_OUTPUT"
+>>>>>>> master
 
+<<<<<<< HEAD
           # Get the GNU multiarch triplet for the current machine.
           # Examples:
           #   x86_64-linux-gnu
           #   aarch64-linux-gnu
           GNU_MULTIARCH="$(gcc -print-multiarch)"
+||||||| 5ec125a91
+          if [[ "$RUNNER_OS" != "Windows" ]]; then
+            echo "OPAMROOT=$HOME/.opam"      >> "$GITHUB_ENV"
+          else
+            echo "OPAMROOT=D:\\.opam"        >> "$GITHUB_ENV"
+          fi
+=======
+      - name: Restore compiler build state
+        if: github.base_ref == 'master' || github.ref == 'refs/heads/master'
+        id: compiler-build-state
+        uses: actions/cache/restore@v6
+        with:
+          path: |
+            C:\.cache\dune
+            ~/.cache/dune
+            _build
+          key: ${{ steps.compiler-build-state-key.outputs.value }}
+>>>>>>> master
 
+<<<<<<< HEAD
           # Convert the GNU triplet into the musl include directory name.
           # Examples:
           #   x86_64-linux-gnu  -> x86_64-linux-musl
@@ -184,6 +326,39 @@ jobs:
             _build
           key: ${{ steps.compiler-build-state-key.outputs.value }}
 
+||||||| 5ec125a91
+          OPAM_PATH="$(cat .opam-path)"
+          chmod +x "$OPAM_PATH"
+          dirname "$OPAM_PATH" >> "$GITHUB_PATH"
+
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            fsutil behavior query SymlinkEvaluation
+            fsutil behavior set symlinkEvaluation R2L:1 R2R:1
+            fsutil behavior query SymlinkEvaluation
+
+            CYGWIN="winsymlinks:native"
+            CYGWIN_ROOT="D:\\cygwin"
+            CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
+            CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
+
+            echo "HOME=$USERPROFILE" >> "$GITHUB_ENV"
+            echo "MSYS=winsymlinks:native" >> "$GITHUB_ENV"
+            echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
+            echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
+
+            echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
+          fi
+        shell: bash
+
+      # see https://github.com/ocaml/setup-ocaml/issues/815
+      - name: "Windows: set SHELLOPTS=igncr"
+        if: runner.os == 'Windows'
+        run: echo "SHELLOPTS=igncr" >>"$GITHUB_ENV"
+          
+=======
+>>>>>>> master
       - name: Build compiler
         run: opam exec -- dune build --display quiet
 
@@ -283,9 +458,31 @@ jobs:
         run: make -C tests/gentype_tests/typescript-react-example clean test
         shell: bash
 
+<<<<<<< HEAD
       - name: Run LSP tests
         run: opam exec -- make test-lsp
+||||||| 5ec125a91
+      - name: Run syntax benchmarks
+        if: matrix.benchmarks
+        run: ./_build/install/default/bin/syntax_benchmarks | tee tests/benchmark-output.json
+=======
+      - name: Run OCaml rewatch parity tests
+        if: ${{ !contains(matrix.ocaml_compiler, '5.0.0') }}
+        timeout-minutes: 20
+        run: |
+          . rewatch-ocaml/tests/process_watchdog.sh
+          start_process_watchdog
+          bash rewatch-ocaml/tests/check_canonical_test_coverage.sh
+          bash rewatch-ocaml/tests/check_config_acceptance.sh \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+          bash rewatch-ocaml/tests/check_command_validation.sh \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+        shell: bash
+>>>>>>> master
 
+<<<<<<< HEAD
       - name: Run OCaml rewatch parity tests
         if: ${{ !contains(matrix.ocaml_compiler, '5.0.0') }}
         timeout-minutes: 20
@@ -347,6 +544,75 @@ jobs:
         if: matrix.node-target == 'linux-arm64'
         run: ./rewatch/tests/suite.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe
         shell: bash
+||||||| 5ec125a91
+      - name: Restore previous benchmark data
+        if: matrix.benchmarks
+        uses: actions/cache/restore@v4
+        with:
+          path: ./tests/benchmark-cache
+          key: syntax-benchmark-v1
+ 
+      - name: Create new benchmark data and comment on alert
+        # Do not run for PRs created from other repos as those won't be able to write to the pull request
+        if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
+        uses: benchmark-action/github-action-benchmark@v1
+        with:
+          name: Syntax Benchmarks
+          tool: customSmallerIsBetter
+          output-file-path: tests/benchmark-output.json
+          external-data-json-path: ./tests/benchmark-cache/benchmark-data.json
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          alert-threshold: "105%"
+          comment-always: false
+          comment-on-alert: true
+=======
+      - name: Run OCaml rewatch interactive output tests
+        # Terminal rendering depends on the host OS, not the CPU architecture.
+        # Use the faster ARM runners for one Linux and one macOS check. Windows
+        # does not provide a reliable native equivalent of the `script` PTY.
+        if: matrix.node-target == 'linux-arm64' || matrix.node-target == 'darwin-arm64'
+        timeout-minutes: 15
+        run: |
+          bash rewatch-ocaml/tests/check_interactive_output.sh \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+        shell: bash
+
+      - name: Run OCaml rewatch verbose output tests
+        if: ${{ !contains(matrix.ocaml_compiler, '5.0.0') }}
+        timeout-minutes: 10
+        run: |
+          bash rewatch-ocaml/tests/check_verbose_output.sh \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe \
+            packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+        shell: bash
+
+      - name: Run OCaml rewatch unit tests
+        timeout-minutes: 10
+        run: |
+          opam exec -- dune build tests/rewatch_ounit_tests/rewatch_ounit_tests_main.exe
+          # Run the executable directly so a stuck test leaves live progress;
+          # dune otherwise buffers the test output until the action exits.
+          opam exec -- ./_build/default/tests/rewatch_ounit_tests/rewatch_ounit_tests_main.exe -runner sequential
+        shell: bash
+
+      - name: Run OCaml rewatch focused integration tests
+        timeout-minutes: 30
+        run: |
+          sh rewatch-ocaml/tests/run.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+        shell: bash
+
+      - name: Run OCaml rewatch canonical tests
+        run: ./rewatch/tests/suite.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+        shell: bash
+
+      # The Rust implementation is kept for comparison. One platform runs its
+      # shared suite; the parity steps exercise it on every platform.
+      - name: Run Rust rewatch reference tests
+        if: matrix.node-target == 'linux-arm64'
+        run: ./rewatch/tests/suite.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript-rust.exe
+        shell: bash
+>>>>>>> master
 
       - name: Build playground compiler
         if: matrix.build_playground
@@ -533,6 +799,7 @@ jobs:
           artifact-ids: ${{ needs.build-compiler.outputs.api-docs-artifact-id }}
           path: data/api
 
+<<<<<<< HEAD
       - name: Check if repo is clean
         id: diffcheck
         run: |
@@ -570,6 +837,48 @@ jobs:
   test-installation-npm:
     needs:
       - pkg-pr-new
+||||||| 5ec125a91
+  installationTest:
+    needs: package
+=======
+      - name: Check if repo is clean
+        id: diffcheck
+        run: |
+          git status
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "clean=true" >> $GITHUB_OUTPUT
+          else
+            echo "clean=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Use Node.js
+        if: steps.diffcheck.outputs.clean == 'false'
+        uses: actions/setup-node@v7
+        with:
+          cache: yarn
+          node-version-file: .node-version
+
+      - name: Build website
+        if: steps.diffcheck.outputs.clean == 'false'
+        run: |
+          yarn
+          yarn build
+
+  test-devcontainer:
+    runs-on: ubuntu-26.04-arm
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+      - name: Run make in dev container
+        uses: devcontainers/ci@v0.3
+        with:    
+          push: never
+          runCmd: make
+
+  test-installation-npm:
+    needs:
+      - pkg-pr-new
+>>>>>>> master
     strategy:
       fail-fast: false
       matrix: