diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html
index c9856cce..70daa503 100644
--- a/app/frontend/templates/panel/config_json.html
+++ b/app/frontend/templates/panel/config_json.html
@@ -46,35 +46,43 @@
{% if isinstance(item[1], list) %}
-
-
- {% elif isinstance(item[1], bool) %}
+ <<<<<<< HEAD
+
+ =======
+