diff --git a/init.lua b/init.lua
index ca2eeea..6a02a62 100644
--- a/init.lua
+++ b/init.lua
@@ -36,7 +36,11 @@ for i in ipairs(coral_color) do
    })
 end
 
+<<<<<<< HEAD
 minetest.register_abm({
+=======
+minetest.register_abm({ --Coral dyes when exposed to air.
+>>>>>>> f6636f9c133a01f478836f857ec430901f4ff3f7
    nodenames = {'group:coral'},
    neighbors = {'air'},
    interval = 17,
@@ -47,6 +51,27 @@ minetest.register_abm({
    end,
 })
 
+<<<<<<< HEAD
+=======
+minetest.register_abm({ --Coral can spread, but very slowly.
+   nodenames = {'group:coral'},
+   neighbors = {'group:water'},
+   interval = 500,
+   chance = 25,
+   catch_up = false,
+   action = function(pos, node)
+      local posx = math.random(-1, 1)
+      local posy = math.random(-1, 1)
+      local posz = math.random(-1, 1)
+      local new_pos = {x=pos.x+posx, y=pos.y+posy, z=pos.z+posz}
+      local new_node = minetest.get_node(new_pos).name
+      if minetest.get_item_group(new_node, 'water') > 0 then
+         minetest.set_node(new_pos, {name = node.name})
+      end
+   end,
+})
+
+>>>>>>> f6636f9c133a01f478836f857ec430901f4ff3f7
 minetest.register_decoration({
    name = "default:corals",
    deco_type = "simple",
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 1960ae1..0000000
--- a/license.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-code is licensed MIT
-
-more_coral_coral_base.png based on coral texture from MTG. Created by Pithydon licensed CC by SA.
diff --git a/mod.conf b/mod.conf
index a9383e0..86d41dd 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,4 +1,8 @@
 name = more_coral
 depends = default, dye
+<<<<<<< HEAD
 license = 
+=======
+license = Code is licensed MIT, Media CC by SA 4.0
+>>>>>>> f6636f9c133a01f478836f857ec430901f4ff3f7
 author = NathanSalapat