diff --git a/mods/utils/settings.lua b/mods/utils/settings.lua
index 14d2a86..c8cbe20 100644
--- a/mods/utils/settings.lua
+++ b/mods/utils/settings.lua
@@ -64,11 +64,7 @@ end
 --         or nil.
 function settings.get_bool(name, default_value)
 	local value = minetest.settings:get_bool(name)
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> 316debdfa967a6285be3ddbe9c2b9ca6b114ee9e
 	if value ~= nil then
 		return value
 	else
@@ -115,11 +111,6 @@ end
 --         or nil.
 function settings.get_pos2d(name, default_value)
 	local value = minetest.settings:get(name)
-<<<<<<< HEAD
-
-=======
-	
->>>>>>> 316debdfa967a6285be3ddbe9c2b9ca6b114ee9e
 	if value ~= nil then
 		local splitted_value = stringutil.split(value, ",")