diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 42bdf6fb7bf..9c64164b6fc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,8 +7,6 @@
 # Maptainers
 /_maps/ @KathrinBailey
 
-<<<<<<< HEAD
-=======
 # Cyberboss
 
 /code/__HELPERS/jatum.dm @Cyberboss
@@ -84,4 +82,3 @@
 
 #SIC SEMPER TYRANNIS
 /code/modules/hydroponics/grown/citrus.dm @optimumtact
->>>>>>> 7f742ed0738 (Fix Mothblocks' CODEOWNERS (#57236))
diff --git a/modular_skyrat/readme.md b/modular_skyrat/readme.md
index 9d9b285ac4f..01422340636 100644
--- a/modular_skyrat/readme.md
+++ b/modular_skyrat/readme.md
@@ -42,11 +42,7 @@ but then our upstream introduces a change in their codebase, changing it from 1
 As easy of an example as it is, it results in a relatively simple conflict, in the form of
 
 ```byond
-<<<<<<< HEAD
-var/something = 2 //SKYRAT EDIT
-=======
 var/something = 4
->>>>>>> upstream-mirror-123132
 ```
 
 where we pick the preferable option manually.
diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1
index 77993bab01e..a2c690b12f1 100644
--- a/tgui/bin/tgui_.ps1
+++ b/tgui/bin/tgui_.ps1
@@ -51,18 +51,17 @@ function task-dev-server {
 }
 
 ## Run a linter through all packages
-<<<<<<< HEAD
-function task-eslint {
-  yarn run eslint packages @Args
-=======
 function task-lint {
   yarn run tsc
   Write-Output "tgui: type check passed"
   yarn run eslint packages --ext ".js,.jsx,.ts,.tsx,.cjs,.mjs" @Args
->>>>>>> 9d17292c03a (Fix lint task in tgui powershell script (#57154))
   Write-Output "tgui: eslint check passed"
 }
 
+function task-test {
+  yarn run jest
+}
+
 ## Mr. Proper
 function task-clean {
   ## Build artifacts
@@ -101,21 +100,28 @@ if ($Args.Length -gt 0) {
   if ($Args[0] -eq "--lint") {
     $Rest = $Args | Select-Object -Skip 1
     task-install
-    task-eslint @Rest
+    task-lint @Rest
     exit 0
   }
 
   if ($Args[0] -eq "--lint-harder") {
     $Rest = $Args | Select-Object -Skip 1
     task-install
-    task-eslint -c ".eslintrc-harder.yml" @Rest
+    task-lint -c ".eslintrc-harder.yml" @Rest
     exit 0
   }
 
   if ($Args[0] -eq "--fix") {
     $Rest = $Args | Select-Object -Skip 1
     task-install
-    task-eslint --fix @Rest
+    task-lint --fix @Rest
+    exit 0
+  }
+
+  if ($Args[0] -eq "--test") {
+    $Rest = $Args | Select-Object -Skip 1
+    task-install
+    task-test @Rest
     exit 0
   }
 
@@ -130,7 +136,7 @@ if ($Args.Length -gt 0) {
 ## Make a production webpack build
 if ($Args.Length -eq 0) {
   task-install
-  task-eslint
+  task-lint
   task-webpack --mode=production
   exit 0
 }