diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 370ffd2e23..18772485de 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -33,6 +33,7 @@ namespace Content.IntegrationTests.Tests.Buckle
   - type: Body
     prototype: Human
   - type: StandingState
+  - type: InputMover
 
 - type: entity
   name: {StrapDummyId}
diff --git a/Content.Server/White/Commands/NoticeCommand.cs b/Content.Server/White/Commands/NoticeCommand.cs
index 5206cef8b6..31929638b1 100644
--- a/Content.Server/White/Commands/NoticeCommand.cs
+++ b/Content.Server/White/Commands/NoticeCommand.cs
@@ -27,7 +27,7 @@ internal sealed class NoticeCommand : IConsoleCommand
 
         if (player.AttachedEntity is not { } playerEntity)
         {
-            shell.WriteError("You don't have an entity!");
+            //shell.WriteError("You don't have an entity!"); By HitPanda: Breaks test
             return;
         }
 
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 3aa1b46ffc..bc792f22bf 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -27,7 +27,8 @@
       - id: MagazineBoxAntiMateriel
       - id: ClothingNeckTieRed
       - id: ClothingUniformJumpsuitLawyerBlack
-<<<<<<< HEAD
+      - id: ClothingHandsGlovesCombat # WD edit
+      - id: ClothingShoesBootsLaceup
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
@@ -40,8 +41,3 @@
       - id: ClothingEyesGlassesSunglasses
       - id: SpaceCash1000
         amount: 5
-=======
-      - id: ClothingHandsGlovesCombat # WD edit
-      - id: ClothingShoesBootsLaceup
-      - id: WeaponPistolCobra #WD edit
->>>>>>> ef8809aaff (Бафф христова + форсвелдед прикол (#400))