diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index e3743987b15c62b..49c898d7199e68d 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -89,6 +89,7 @@ jobs:
         run: |
           bash tools/ci/check_grep.sh
           bash modular_nova/tools/nova_check_grep.sh # NOVA EDIT ADDITION - checking modular_nova code
+          bash ss220/tools/ss220_check_grep.sh # SS220 EDIT ADDITION - checking modular_ss220 code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |
diff --git a/.github/workflows/codeowner_reviews.yml b/.github/workflows/codeowner_reviews.yml
deleted file mode 100644
index d41edd940b89805..000000000000000
--- a/.github/workflows/codeowner_reviews.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Codeowner Reviews
-
-# Controls when the workflow will run
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, ready_for_review]
-
-jobs:
-  assign-users:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v4
-
-      #Parse the Codeowner file on non draft PRs
-      - name: CodeOwnersParser
-        if: github.event.pull_request.draft == false
-        id: CodeOwnersParser
-        uses: tgstation/CodeOwnersParser@v1
-
-      #Request reviews
-      - name: Request reviews
-        if: steps.CodeOwnersParser.outputs.owners != ''
-        uses: tgstation/RequestReviewFromUser@v1
-        with:
-          separator: ' '
-          users: ${{ steps.CodeOwnersParser.outputs.owners }}
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
new file mode 100644
index 000000000000000..9496bcf712770db
--- /dev/null
+++ b/.github/workflows/conflicts.yml
@@ -0,0 +1,19 @@
+name: 'Merge Conflict Detection'
+on:
+  push:
+    branches:
+      - master220
+      - 'project/**'
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: eps1lon/actions-label-merge-conflict@v2.1.0
+        with:
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ss220/tools/ss220_check_grep.sh b/ss220/tools/ss220_check_grep.sh
new file mode 100644
index 000000000000000..4b716c7a585c389
--- /dev/null
+++ b/ss220/tools/ss220_check_grep.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#ANSI Escape Codes for colors to increase contrast of errors
+RED="\033[0;31m"
+GREEN="\033[0;32m"
+BLUE="\033[0;34m"
+NC="\033[0m" # No Color
+
+echo -e "${BLUE}Re-running grep checks, but looking in modular_ss220...${NC}"
+
+# Run the linters again, but modular skyrat code.
+sed "s|code/\*\*/\*\.dm|modular_ss220/\*\*/\*\.dm|g" <tools/ci/check_grep.sh | bash
diff --git a/tools/build/build.js b/tools/build/build.js
index 5a12be5624c425d..66c0c9a3a6a2d27 100644
--- a/tools/build/build.js
+++ b/tools/build/build.js
@@ -217,6 +217,7 @@ export const DmTarget = new Juke.Target({
     'icons/**',
     'interface/**',
     'modular_nova/**', ///NOVA EDIT ADDITION - Making the CBT work
+    'modular_ss220/**', ///SS220 EDIT ADDITION - Making the CBT work
     `${DME_NAME}.dme`,
     NamedVersionFile,
   ],