diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5010260b9a..60a5507674 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,36 +23,6 @@ jobs:
         run: |
           tools/ci/validate_files.sh
           tools/ci/build_tgui.sh
-
-<<<<<<< HEAD
-#  dreamchecker:
-#    name: DreamChecker
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: actions/checkout@v2
-#
-#      - name: Cache SpacemanDMM
-#        uses: actions/cache@v2
-#        with:
-#          path: ~/SpacemanDMM
-#          key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
-#          restore-keys: ${{ runner.os }}-dreamchecker
-#      
-#      - name: Install Dependencies
-#        run: |
-#          tools/ci/install_spaceman_dmm.sh dreamchecker
-#          
-#      - name: Run Linter
-#        id: linter
-#        run: |
-#          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
-#          
-#      - name: Annotate Linter
-#        uses: yogstation13/DreamAnnotate@v1
-#        if: always()
-#        with: 
-#          outputFile: output-annotations.txt
-=======
   dreamchecker:
     name: DreamChecker
     runs-on: ubuntu-latest
@@ -69,18 +39,15 @@ jobs:
       - name: Install Dependencies
         run: |
           tools/ci/install_spaceman_dmm.sh dreamchecker
-
       - name: Run Linter
         id: linter
         run: |
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
-
       - name: Annotate Linter
         uses: yogstation13/DreamAnnotate@v1
         if: always()
         with:
           outputFile: output-annotations.txt
->>>>>>> 27374124c4... Merge pull request #13164 from ItsSelis/tgui-prettierx
 
   unit_tests:
     name: Integration Tests