diff --git a/eco-core/core-plugin/src/main/resources/mobs/_example.yml b/eco-core/core-plugin/src/main/resources/mobs/_example.yml
index 48b28d9..f3cdde7 100644
--- a/eco-core/core-plugin/src/main/resources/mobs/_example.yml
+++ b/eco-core/core-plugin/src/main/resources/mobs/_example.yml
@@ -87,11 +87,19 @@ effects:
   # Ran from the perspective of the player
   any-attack: [ ]
 
+<<<<<<< HEAD
   # Effects ran when the mob takes damage
   # Ran from the perspective of the entity
   take-damage: [ ]
 
   # Effects ran when the player is damaged by the mob
+=======
+    # Effects ran when the mob takes damage
+  # Ran from the perspective of the entity
+  take-damage: [ ]
+
+    # Effects ran when the player is damaged by the mob
+>>>>>>> f031fb51c6a3787bc44e8bc099d3655e74366f70
   # Ran from the perspective of the player
   damage-player: [ ]
 
diff --git a/gradle.properties b/gradle.properties
index 7d97522..f9b2f5c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 #libreforge-updater
-#Thu Jan 04 17:25:24 GMT 2024
+#Sun Jan 07 13:52:32 GMT 2024
 kotlin.code.style=official
 libreforge-version=4.54.0
-version=10.0.0-b6
+version=10.0.0-b7