diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 433ad722a5..4c4d989790 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -35,6 +35,7 @@ impl Body {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 const ALL_OBJECTS: [Body; 24] = [
     Body::Bomb,
@@ -65,3 +66,12 @@ const ALL_OBJECTS: [Body; 24] = [
 =======
 const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::Pumpkin, Body::Campfire];
 >>>>>>> Add campfire
+=======
+const ALL_OBJECTS: [Body; 5] = [
+    Body::Bomb,
+    Body::Scarecrow,
+    Body::Chest,
+    Body::Pumpkin,
+    Body::Campfire,
+];
+>>>>>>> formatting