diff --git a/main.c b/main.c
index 4ef2f49..ed13cb4 100644
--- a/main.c
+++ b/main.c
@@ -7,11 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-<<<<<<< HEAD
     //readImages("mnist_test.info2");
-=======
-    readImages("mnist_test.info2");
->>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2
     
     const unsigned int windowWidth = 800;
     const unsigned int windowHeight = 600;
@@ -73,8 +69,4 @@ int main(int argc, char *argv[])
 
     return exitCode;
     
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2