fixed merge conflicts that remained from a previous merge

source/main.c

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 #include <pthread.h>
 #include "headers/cpu.h"
 #include "headers/ram.h"
@@ -28,32 +26,6 @@ void handler(char *url, cJSON object) {
         curl_easy_cleanup(curl);
     }
     curl_global_cleanup();
-=======
-#include <stdio.h>
-#include "cpu.h"
-
-int main(int argc, char* argv[]) {
-
-    if (argc > 0)
-    {
-        switch (*argv[1]){
-            
-            case "name":
-                char *name = cpu_name(void);
-                printf("%s", &name);
-                break;
-            case "frequency": 
-                float frequency = cpu_freq(void);
-                printf("%f", frequency);
-                break;
-            default: 
-                return 1;
-        }
-        return 1;
-    }
-
-    return 0;
->>>>>>> 7e64275 (maocs now returns cpu name)
 }
 
 void setup_mt() {