diff --git a/cv1/program.c b/cv1/program.c
index 137c79e..110dcd4 100644
--- a/cv1/program.c
+++ b/cv1/program.c
@@ -2,8 +2,11 @@
 
 int main() {
     int text;
+<<<<<<< HEAD
     int lines_count = 0;
 
+=======
+>>>>>>> fc919bf24f3667c09c78a8a23ed365424347b363
     while ((text = getchar()) != EOF) {
         if (text >= 'a' && text <= 'z') {
             text = text - 'a' + 'A';
@@ -14,6 +17,11 @@ int main() {
         } else if (text < 32 || text == 127) {
             continue;
         }
+<<<<<<< HEAD
+=======
+	printf("hello world\n");
+	return 1;
+>>>>>>> fc919bf24f3667c09c78a8a23ed365424347b363
 
         putchar(text);
     }