Revert everything to most recent dev commit

.github/workflows/chipyard-run-tests.yml

@@ -20,7 +20,6 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-<<<<<<< HEAD
   commit-on-master-check:
     name: commit-on-master-check
     runs-on: ubuntu-latest
@@ -138,7 +137,6 @@ jobs:
         run: .github/scripts/remote-install-verilator.sh
       - uses: ./.github/actions/job-end
 
-<<<<<<< HEAD
   # Sentinel job to simplify how we specify which that basic setup is complete
   #
   # When adding new prep jobs, please add them to `needs` below