diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index b3f63775b..b1d810e0a 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -881,8 +881,6 @@
     <Compile Include="View\EmployeeArbeitszeitView.xaml.cs">
       <DependentUpon>EmployeeArbeitszeitView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
-      <DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>
     <Compile Include="View\Navigation\CustomerTeamNavigationView.xaml.cs">
       <DependentUpon>CustomerTeamNavigationView.xaml</DependentUpon>
     </Compile>
diff --git a/Data/Data.csproj b/Data/Data.csproj
index e9d2e8e9f..f7a7635d5 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -567,22 +567,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
-<Content Include="Mappings\CustomerTeam.hbm.xml" /><EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mappings\Employee2Token.hbm.xml" />
-    <EmbeddedResource Include="Mappings\Customer2Token.hbm.xml" />
-    <EmbeddedResource Include="Mappings\Token.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource><<<<<<< .mine
-
-
-
-
-
-
-
-=======
+	<Content Include="Mappings\CustomerTeam.hbm.xml" />
+	<EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Mappings\Employee2Token.hbm.xml" />
@@ -590,7 +576,6 @@
     <EmbeddedResource Include="Mappings\Token.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
->>>>>>> .theirs
     <EmbeddedResource Include="Mappings\ArbeitszeitEintrag.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/Model/Changes_2017_06_22.txt b/Model/Changes_2017_06_22.txt
index 86b999775..13c165f91 100644
--- a/Model/Changes_2017_06_22.txt
+++ b/Model/Changes_2017_06_22.txt
@@ -1,4 +1,4 @@
-CREATE TABLE `1234567890`.`token` (
+CREATE TABLE `token` (
   `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
  
  `Tid` INT(10) NULL COMMENT '',
@@ -18,7 +18,7 @@ CREATE TABLE `1234567890`.`token` (
 
 
 
-CREATE TABLE `1234567890`.`customer2token` (
+CREATE TABLE `customer2token` (
   `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
  
  `CustomerOid` BIGINT(19) NULL COMMENT '',
@@ -39,7 +39,7 @@ CREATE TABLE `1234567890`.`customer2token` (
 
 
 
-CREATE TABLE `1234567890`.`employee2token` (
+CREATE TABLE `employee2token` (
   `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
  
  `EmployeeOid` BIGINT(19) NULL COMMENT '',
diff --git a/Model/Changes_2017_07_26.txt b/Model/Changes_2017_07_26.txt
index 1ddaccce1..b7039020e 100644
--- a/Model/Changes_2017_07_26.txt
+++ b/Model/Changes_2017_07_26.txt
@@ -1,4 +1,4 @@
-ALTER TABLE `1234567890`.`servicerecord` 
+ALTER TABLE `servicerecord` 
 
 ADD COLUMN `RTFNotice1` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `ServiceRecordFormat`,
 
diff --git a/Model/Changes_2017_08_08.txt b/Model/Changes_2017_08_08.txt
index 44dee5dee..bb94e42bf 100644
--- a/Model/Changes_2017_08_08.txt
+++ b/Model/Changes_2017_08_08.txt
@@ -1,4 +1,4 @@
-CREATE TABLE `1234567890`.`quittierungscheck` (
+CREATE TABLE `quittierungscheck` (
   `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
   
 `EmployeeOid` BIGINT(19) NULL COMMENT '',
diff --git a/Model/Changes_2017_08_09.txt b/Model/Changes_2017_08_09.txt
index 23972ef02..b5495d1fb 100644
--- a/Model/Changes_2017_08_09.txt
+++ b/Model/Changes_2017_08_09.txt
@@ -1,9 +1,9 @@
-ALTER TABLE `1234567890`.`quittierungscheck` 
+ALTER TABLE `quittierungscheck` 
 
 ADD COLUMN `QuittierungsbelegGedrucktAm` DATETIME NULL DEFAULT NULL COMMENT '' AFTER `QuittierungsbelegUnterschrieben`;
 
 
-ALTER TABLE `1234567890`.`quittierungscheck` 
+ALTER TABLE `quittierungscheck` 
 DROP COLUMN `EmployeeOid`,
 ADD COLUMN `QuittierungsbelegUnterschriebenVon` 
 BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `QuittierungsbelegGedrucktAm`,
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 4cf668e79..0dbc1e890 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -122,18 +122,14 @@ namespace BS.Shared
         MedRecord                                 = 115,
         ChatMessage                               = 116,
         ChatMediaMessage                          = 117,
-<<<<<<< .mine
         NewestChatMessage                         = 118,
-=======
-        NewestChatMessage                         = 118,
->>>>>>> .theirs
         Customer2Token                            = 119,
-        CustomerTeam                              = 119
         Token                                     = 120,
         Vertretung                                = 121,
         Employee2Token                            = 122,
-        QuittierungsCheck                         = 123
-    }
+        QuittierungsCheck                         = 123,
+		CustomerTeam                              = 124,
+	}
 
     public enum SystemEntryID
     {