diff --git a/src/Functions.pbi b/src/Functions.pbi
index ca0a181..bf3409b 100644
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@@ -6,11 +6,7 @@
 UsePNGImageDecoder()
 
 Procedure InitTileset()
-<<<<<<< HEAD
-	LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
-=======
 	LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
->>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure