diff --git a/config.h b/config.h
index 2612482..2ee94f7 100644
--- a/config.h
+++ b/config.h
@@ -632,9 +632,9 @@
 
 // Buffer size for load/save configuration as JSON
 
-#define JSON_BUFFER_SIZE 8192
+#define JSON_BUFFER 8192 //This line put back to resolve a merge conflict. this line should be removed
 
-#define JSON_BUFFER 1024 //This line put back to resolve a merge conflict. this line should be removed
+#define JSON_BUFFER_SIZE 8192
 
 // Internal configuration structure
 typedef struct dexed_s {