diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
index 55452f30aca608457052542b4d000a86bcb4411f..0841eef8f6460bdc336baaaceb6eab057d601e87 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
@@ -231,13 +231,8 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
-<<<<<<< HEAD
- <column name="INFO" valueClobFile="activity/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt"/>
- <column name="RESPONSIBLE" value="Admin"/>
-=======
<column name="INFO" valueClobFile="activity/INFO/clobFiles/83aed38de7ea30e68b0ea8c99f40342c.txt"/>
<column name="RESPONSIBLE" value="Admin "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="SUBJECT" value="Webinar: Transparentes Kampagnen- und Veranstaltungsmanagement"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -577,7 +572,6 @@
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="activity">
-<<<<<<< HEAD
<column name="ACTIVITYID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
<column name="DATE_NEW" valueDate="2019-11-15T01:03:22"/>
<column name="DIRECTION" value="o"/>
@@ -587,8 +581,6 @@
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="activity">
-=======
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
<column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-11-15T08:53:04"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
index be5bf9cff4ef664de7aeee8cab754fa719c20c8a..835610fe150f905380503249bddd4a29a5894e15 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -29,13 +29,8 @@
<insert tableName="salesproject">
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-<<<<<<< HEAD
- <column name="PHASE" value="SALPROJPHASENEGO"/>
- <column name="PROBABILITY" value="SALPROJPROB50"/>
-=======
<column name="PHASE" value="SALPROJPHASEOFFER "/>
<column name="PROBABILITY" value="SALPROJPROB50 "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="PROJECTCODE" valueNumeric="1005"/>
<column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
<column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
@@ -46,13 +41,9 @@
<insert tableName="salesproject">
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
-<<<<<<< HEAD
- <column name="PHASE" value="SALPROJPHASESQO"/>
- <column name="PROBABILITY" value="SALPROJPROB25"/>
-=======
<column name="PHASE" value="SALPROJPHASESAL "/>
<column name="PROBABILITY" value="SALPROJPROB25 "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
+
<column name="PROJECTCODE" valueNumeric="1004"/>
<column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
<column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -73,13 +64,8 @@
<insert tableName="salesproject">
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-<<<<<<< HEAD
- <column name="PHASE" value="SALPROJPHASESQO"/>
- <column name="PROBABILITY" value="SALPROJPROB50"/>
-=======
<column name="PHASE" value="SALPROJPHASEMQC "/>
<column name="PROBABILITY" value="SALPROJPROB50 "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="PROJECTCODE" valueNumeric="1006"/>
<column name="PROJECTTITLE" value="Buchner Neuprojekt"/>
<column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
index a08fbe5d7ae42283437837576cda5b2f7d59ba35..416682520dcde632682cf8f31b432eabd6a50b60 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
@@ -145,9 +145,7 @@
<column name="TASKID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
</insert>
<insert tableName="task">
-<<<<<<< HEAD
<column name="KIND" value="TASK"/>
-=======
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="KIND" value="TASK "/>
<column name="MATURITY_DATE" valueDate="2019-12-02T10:00:00"/>
@@ -162,7 +160,6 @@
</insert>
<insert tableName="task">
<column name="KIND" value="TASK "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
<column name="PRIORITY" value="TASKPRIOLOW"/>
<column name="PROGRESS" value="TASKPROG25"/>
@@ -214,9 +211,7 @@
</insert>
<insert tableName="task">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-<<<<<<< HEAD
<column name="KIND" value="TASK"/>
-=======
<column name="KIND" value="TASK "/>
<column name="MATURITY_DATE" valueDate="2019-12-02T09:59:00"/>
<column name="PRIORITY" value="TASKPRIOLOW "/>
@@ -231,7 +226,6 @@
<insert tableName="task">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="KIND" value="TASK "/>
->>>>>>> d7caa3ebd... new demo data (data privacy)
<column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
<column name="PRIORITY" value="TASKPRIOMEDIUM"/>
<column name="PROGRESS" value="TASKPROG50"/>