diff --git a/src/libUnuk/Makefile b/src/libUnuk/Makefile
index 2a12948..02887e2 100644
--- a/src/libUnuk/Makefile
+++ b/src/libUnuk/Makefile
@@ -5,10 +5,7 @@ objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
 	    Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o  \
 	    Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
 	    Rect.o Text.o Texture.o TextureManager.o Timer.o \
-<<<<<<< HEAD
-=======
         AStar.o \
->>>>>>> playground
 
 .PHONY: default all clean