diff --git a/fin_lab34.cpp b/fin_lab34.cpp
index 929da32..833d0ae 100644
--- a/fin_lab34.cpp
+++ b/fin_lab34.cpp
@@ -35,6 +35,7 @@ input_data(istream &thread, bool &prompt){
 }
 
 int
+<<<<<<< HEAD
 main(int argc, char* argv[]){
     curl_global_init(CURL_GLOBAL_ALL);
     if (argc > 1) {
@@ -43,6 +44,10 @@ main(int argc, char* argv[]){
                 cout << argv[i] << endl;
             }
     }
+=======
+main(){
+    curl_global_init(CURL_GLOBAL_ALL);
+>>>>>>> origin/main
     //CURLcode curl_global_init(CURL_GLOBAL_ALL);
     size_t font = 0;
     bool prompt = false;