fix merge

entity/Organisation_entity/Organisation_entity.aod

@@ -649,4 +649,4 @@
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
-</entity
+</entity>

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2491,7 +2491,7 @@
       <key>member</key>
     </entry>
     <entry>
-      <key>promotion target by</key>
+      <key>promotion target of</key>
     </entry>
     <entry>
       <key>supports</key>
@@ -2556,12 +2556,6 @@
     <entry>
       <key>New attribute</key>
     </entry>
-    <entry>
-      <key>Special price list</key>
-    </entry>
-    <entry>
-      <key>New attribute</key>
-    </entry>
     <entry>
       <key>MQC</key>
     </entry>
@@ -2585,4 +2579,4 @@ select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE</element>
       </statements>
     </languageSql>
   </sqlModels>
-</language
+</language>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -2997,6 +2997,12 @@
     <entry>
       <key>Special price list1</key>
     </entry>
+    <entry>
+      <key>MQC</key>
+    </entry>
+    <entry>
+      <key>Relation type</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2583,6 +2583,12 @@
     <entry>
       <key>New attribute</key>
     </entry>
+    <entry>
+      <key>MQC</key>
+    </entry>
+    <entry>
+      <key>Relation type</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>