diff --git a/cv1/program.c b/cv1/program.c
index 3b85483..14a1988 100644
--- a/cv1/program.c
+++ b/cv1/program.c
@@ -2,8 +2,6 @@
 
 int main() {
     int text;
-
-<<<<<<< HEAD
     while ((text = getchar()) != EOF) {
         if (text >= 'a' && text <= 'z') {
             text = text - 'a' + 'A';
@@ -15,10 +13,8 @@ int main() {
         } else if (text < 32 || text == 127) {
             continue;
         }
-=======
 	printf("hello world\n");
 	return 1;
->>>>>>> ae41227d7eccd9cfc8364f26b732c73f151b6d66
 
         putchar(text);
     }