fix merge errors

.liquibase/Data_alias/changelog.xml

@@ -19,5 +19,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>--
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file

entity/Salesproject_entity/Salesproject_entity.aod

@@ -803,7 +803,7 @@
           <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
-        </linkInformation
+        </linkInformation>
         <linkInformation>
           <name>44fba381-e477-4a92-ba82-fc22c3d98c23</name>
           <tableName>MST_TEAM</tableName>