diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 134ea0aa512..f2516d66208 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -91,7 +91,6 @@
   - SecurityCadet # Frontier - No Longer Usable
   - SecurityOfficer # Frontier - No Longer Usable
   - Warden # Frontier - No Longer Usable
-  - SeniorOfficer # Corvax-Frontier
   - PrisonGuard ##nyano
   - Prisoner ##nyano
   - Brigmedic # Frontier
diff --git a/Resources/Prototypes/_NF/Shipyard/canister.yml b/Resources/Prototypes/_NF/Shipyard/canister.yml
index 54834af7380..c8d68b2403b 100644
--- a/Resources/Prototypes/_NF/Shipyard/canister.yml
+++ b/Resources/Prototypes/_NF/Shipyard/canister.yml
@@ -27,4 +27,6 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
+<<<<<<< HEAD
           availableJobs: {}
+=======