diff --git a/cv1/program.c b/cv1/program.c
index 2790b3c..c4d322b 100644
--- a/cv1/program.c
+++ b/cv1/program.c
@@ -1,10 +1,4 @@
 #include <stdio.h>
-<<<<<<< HEAD
-
-int main() {
-    	
-    return 0;
-=======
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
@@ -31,7 +25,6 @@ char hacker_script(char l) {
         case '9': return 'q';
         default: return l;
     }
->>>>>>> e09f5c99e3015efbf8fe09d6ee464b03f7640013
 }
 
 void transform_to_hacker_script(const char *src, char *dest) {