diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
+++ b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
+++ b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml b/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
+++ b/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml b/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml
index 053a73f95..54e3acb22 100644
--- a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml
+++ b/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
             <Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
             <Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
             <Parameter name="autoPersistOnPasswordChange" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml b/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml
index 053a73f95..54e3acb22 100644
--- a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml
+++ b/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
             <Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
             <Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
             <Parameter name="autoPersistOnPasswordChange" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml b/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
index 2d896ceba..74a51085f 100644
--- a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
+++ b/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnPasswordChange" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml b/li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml
index 053a73f95..54e3acb22 100644
--- a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml
+++ b/li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
             <Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
             <Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
             <Parameter name="autoPersistOnPasswordChange" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml b/li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml
index 053a73f95..54e3acb22 100644
--- a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml
+++ b/li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
             <Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
             <Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
             <Parameter name="autoPersistOnPasswordChange" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
         </Parameters>
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
index 3a264c857..3d8edc4b3 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
@@ -7,8 +7,8 @@
 			<!-- parameters for the container itself -->
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
-
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
index bb51b797e..bb573883d 100644
--- a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
index bb51b797e..bb573883d 100644
--- a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
index aaa91f3cb..3d8edc4b3 100644
--- a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
+++ b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
@@ -8,6 +8,7 @@
 			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
 			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
+			<Parameter name="privilegeConflictResolution" value="MERGE"/>
 		</Parameters>
 
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">