Merge branch 'hotfix_changelog_2021.2.3' into '2021.2.3'

Hotfix corrupt changelog file for 2021.2.3

See merge request xrm/basic!1566

.liquibase/Data_alias/basic/2021.2.3/changelog.xml

 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-<<<<<<< HEAD
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="KnowledgeManagement/changelog.xml"/>
-    <include relativeToChangelogFile="true" file="LikeButton/changelog.xml"/>
-=======
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="KnowledgeManagement/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="LikeButton/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Bulkmail/changelog.xml"/>
->>>>>>> 77324a28b170878850fdebd5719d7f50d7e1afab
 </databaseChangeLog>
\ No newline at end of file