diff --git a/main.cpp b/main.cpp
index 34ee0c1..892c5d7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -72,6 +72,17 @@ int main(int argc, char* argv[]){
         return 0;
     }
 
+<<<<<<< HEAD
+=======
+int main(int argc, char* argv[]){
+    if (argc > 1){
+        cout << "argc= " << argc << endl;
+        for (int i = 0; i < argc; i++){
+            cout << "argv[" << i << "] = "  << argv[i] << endl;
+        }
+        return 0;
+    }
+>>>>>>> b0221b538570d8bda16744945dd40187ee81743f
     if (curl_global_init(CURL_GLOBAL_ALL)!=0){
             cerr << "failed cURL" << endl;
             return 1;