diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart
index ac774ab1..4323da85 100644
--- a/test/game/pinball_game_test.dart
+++ b/test/game/pinball_game_test.dart
@@ -54,7 +54,8 @@ void main() {
     Assets.images.boundary.bottom.keyName,
     Assets.images.slingshot.upper.keyName,
     Assets.images.slingshot.lower.keyName,
-<<<<<<< HEAD
+    Assets.images.dino.dinoLandTop.keyName,
+    Assets.images.dino.dinoLandBottom.keyName,
     Assets.images.multiplier.x2.active.keyName,
     Assets.images.multiplier.x2.inactive.keyName,
     Assets.images.multiplier.x3.active.keyName,
@@ -65,10 +66,6 @@ void main() {
     Assets.images.multiplier.x5.inactive.keyName,
     Assets.images.multiplier.x6.active.keyName,
     Assets.images.multiplier.x6.inactive.keyName,
-=======
-    Assets.images.dino.dinoLandTop.keyName,
-    Assets.images.dino.dinoLandBottom.keyName,
->>>>>>> main
   ];
   final flameTester = FlameTester(() => PinballTestGame(assets));
   final debugModeFlameTester = FlameTester(() => DebugPinballTestGame(assets));