Fixed merge conflicts

src/app/Dictionary.h

@@ -34,7 +34,7 @@ namespace DictionaryHelper
           strcpy(_string, Object._string);
         }
         ~StringEntity(){free(_string);}
-        const char *getString(){return _string;}
+        const char *getString() const {return _string;}
         void setString(const char *string = NULL)
         {
           free(_string);_string = NULL;

src/app/Queue.h

@@ -1,5 +1,6 @@
 #ifndef QUEUE_H
 #define QUEUE_H
+#include <Arduino.h>
 
 template <typename T>
 class Queue

src/app/WEBServer.h

@@ -588,9 +588,10 @@ class WEBServer : public TCPServer<T>, public HttpConstants
             return false;
             break;
         }
-      }else
+      }
+      else
       {
-        sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Unable to access the SDCard");
+        sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Api endpoint does not exist");
         return false;
       }