[FIX] Solving PR conflicts

Author: S0S4

src/client/http.c

@@ -1,13 +1,13 @@
 #include "http.h"
 #include "sock.h"
+#include "utils.h"
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include "utils.h"
 
 const char *CONTENT_LENGTH = "Content-Length: ";
 const char *GET_REQ_TEMPLATE =