diff --git a/server/serverv2.c b/server/serverv2.c
index f7d5035..90a5ff0 100644
--- a/server/serverv2.c
+++ b/server/serverv2.c
@@ -76,19 +76,10 @@ int main(int argc, char **argv)
                 }
                 free(namelist);
 
-<<<<<<< HEAD
                 if(s = send(sdconnection, names_files, 512, 0) == 512){
-                    printf("eejo\n");
+                     printf("Done Sending\n");
                     goto start;
                 }
-                
-
-                
-=======
-                send(sdconnection, names_files, 512, 0);
-                printf("Done Sending");
-                goto start;
->>>>>>> d2be62bb14d7513dfd23f9559a93e3de040781a0
             }
             else if (strncmp("SEND", buff, 4) == 0)
             {