diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..a57dbc90
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+## Generic ignorable patterns and files
+*~
+.*.swp
+*bak*
+tags
+*.vim
+
diff --git a/mods/creative/init.lua b/mods/creative/init.lua
index 8f43017a..e03c0b5a 100644
--- a/mods/creative/init.lua
+++ b/mods/creative/init.lua
@@ -76,7 +76,11 @@ creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
 			"size[13,7.5]"..
 			--"image[6,0.6;1,2;player.png]"..
 			default.gui_bg..
+<<<<<<< HEAD
 			"image[0,-0.5;16.5,11.25;default_inventory_bg.png]"..
+=======
+			default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 			default.gui_slots..
 			"list[current_player;main;5,3.5;8,1;]"..
 			"list[current_player;main;5,4.75;8,3;8]"..
diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua
index 7fdaf292..e1d14fa4 100644
--- a/mods/default/furnace.lua
+++ b/mods/default/furnace.lua
@@ -7,7 +7,11 @@ local function active_formspec(fuel_percent, item_percent)
 	local formspec = 
 		"size[8,8.5]"..
 		default.gui_bg..
+<<<<<<< HEAD
 		"image[-2,-0.5;15,11.25;default_furnace_bg.png]"..
+=======
+		default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 		default.gui_slots..
 		"list[current_name;src;2.75,0.5;1,1;]"..
 		"list[current_name;fuel;2.75,2.5;1,1;]"..
@@ -25,7 +29,11 @@ end
 local inactive_formspec =
 	"size[8,8.5]"..
 	default.gui_bg..
+<<<<<<< HEAD
 	"image[-2,-0.5;15,11.25;default_furnace_bg.png]"..
+=======
+	default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 	default.gui_slots..
 	"list[current_name;src;2.75,0.5;1,1;]"..
 	"list[current_name;fuel;2.75,2.5;1,1;]"..
diff --git a/mods/default/init.lua b/mods/default/init.lua
index 6aafbcb2..a123e640 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -23,7 +23,11 @@ end
 
 default.gui_suvival_form = "size[8,8.5]"..
 			default.gui_bg..
+<<<<<<< HEAD
 			"image[-2,-0.5;15,11.25;default_inventory_bg.png]"..
+=======
+			default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 			default.gui_slots..
 			"list[current_player;main;0,4.25;8,1;]"..
 			"list[current_player;main;0,5.5;8,3;8]"..
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index e1ffe268..36d53afa 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -1101,7 +1101,11 @@ minetest.register_node("default:torch", {
 local chest_formspec =
 	"size[8,9]"..
 	default.gui_bg..
+<<<<<<< HEAD
 	"image[-2,-0.5;15,11.25;default_chest_bg.png]"..
+=======
+	default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 	default.gui_slots..
 	"list[current_name;main;0,0.3;8,4;]"..
 	"list[current_player;main;0,4.85;8,1;]"..
@@ -1113,7 +1117,11 @@ local function get_locked_chest_formspec(pos)
 	local formspec =
 		"size[8,9]"..
 		default.gui_bg..
+<<<<<<< HEAD
 		"image[-2,-0.5;15,11.25;default_chest_bg.png]"..
+=======
+		default.gui_bg_img..
+>>>>>>> 5518c277f31800d407ddf2af8b64e532a85f7533
 		default.gui_slots..
 		"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
 		"list[current_player;main;0,4.85;8,1;]"..