diff --git a/mods/shit_poop/init.lua b/mods/shit_poop/init.lua
index ea7c06a..72d349b 100644
--- a/mods/shit_poop/init.lua
+++ b/mods/shit_poop/init.lua
@@ -170,8 +170,8 @@ function destruction_counter.updateCounter(player)
     
     local totalDestruction = destruction_counter.nodesDestroyed + math.floor(nodesDestroyedByHand / 10)
     local percentage = (totalDestruction / 200 * 4)
-    if percentage > 200 then
-        percentage = 200
+    if percentage > 100 then
+        percentage = 100
     end
     player:hud_change(idText, "text", "Shitting & Packing Meter: " .. totalDestruction)
     player:hud_change(idMeter, "scale", {x = percentage, y = 4})
diff --git a/mods/shit_robocops/init.lua b/mods/shit_robocops/init.lua
index fde7e10..dd5880a 100644
--- a/mods/shit_robocops/init.lua
+++ b/mods/shit_robocops/init.lua
@@ -1,6 +1,10 @@
 minetest.register_abm({
     nodenames = {"poop:grey_bricks"},
+<<<<<<< HEAD
     interval = 40,
+=======
+    interval = 30,
+>>>>>>> 742042729b4e3926e0679e3f1775f92d22ae8461
     chance = 200,
     action = function(pos, node, active_object_count, active_object_count_wider)
 		minetest.add_entity({x = pos.x, y = pos.y + 1, z = pos.z}, "robocops:robocop")