diff --git a/Makefile b/Makefile
index 417871e2b3007d3c4f5bf2157fdadaf773ef450b..12f56da47c95a9b77607d27bff74aa04dcf10e5e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
-test: test.c
-	gcc -o test test.c 
+image_tagger: image_tagger.c
+	gcc -o image_tagger image_tagger.c 
diff --git a/image_tagger.c b/image_tagger.c
index b51441f46d8c722edf37ef735517fcd538b80f0b..39467b136e64ea57d821e2d24f626235d75acc89 100644
--- a/image_tagger.c
+++ b/image_tagger.c
@@ -76,7 +76,7 @@ static bool handle_http_request(int sockfd, int player)
     while (*curr == '.' || *curr == '/')
         ++curr;
     // assume the only valid request URI is "/" but it can be modified to accept more files
-<<<<<<< HEAD
+
 
 
 if (strncmp(curr, "?start", 6) == 0){