From c25e5848cf0938061b3a62925ac8da1ffbfc1413 Mon Sep 17 00:00:00 2001
From: warwickh <warwickh@users.noreply.github.com>
Date: Tue, 7 Sep 2021 17:01:24 +1000
Subject: [PATCH] Update settings for merge default

---
 resources/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/settings.xml b/resources/settings.xml
index bd921f0..d4d549b 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -26,7 +26,7 @@
 		<setting label="30041" id="legacyauth" type="bool" default="false" />
         <setting label="30017" type="lsep" />
         <setting label="30018" id="cachetime" type="labelenum"  default="3600" values="1|5|15|30|60|120|180|720|1440|3600"/>
-        <setting label="30043" id="merge" type="bool" default="false" />
+        <setting label="30043" id="merge" type="bool" default="true" />
 		
 	</category>
 </settings>