diff --git a/lib/game/components/launcher.dart b/lib/game/components/launcher.dart
index 983d8268..656dd978 100644
--- a/lib/game/components/launcher.dart
+++ b/lib/game/components/launcher.dart
@@ -16,13 +16,8 @@ class Launcher extends Forge2DBlueprint {
 
   @override
   void build(Forge2DGame gameRef) {
-<<<<<<< HEAD
     plunger = ControlledPlunger(compressionDistance: 20) //12.3
       ..initialPosition = Vector2(38.5, -20);
-=======
-    plunger = ControlledPlunger(compressionDistance: 12.3)
-      ..initialPosition = Vector2(40.1, 38);
->>>>>>> main
 
     final _rocket = RocketSpriteComponent()..position = Vector2(43, 62);