diff --git a/MergeCMInpro.csproj b/MergeCMInpro.csproj
index be88cbb..50d6137 100644
--- a/MergeCMInpro.csproj
+++ b/MergeCMInpro.csproj
@@ -1,4 +1,3 @@
-<Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -13,26 +12,13 @@
   </ItemGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
-    <PackageReference Include="Microsoft.Office.Interop.Excel" Version="16.0.18925.20022" />
-    <PackageReference Include="NLog" Version="4.7.11" />
+    <PackageReference Include="Microsoft.Office.Interop.Excel" Version="16.0.0.0" />
     <PackageReference Include="ODP.NetCore" Version="2.0.12" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="config\" />
-=======
-    <COMReference Include="Microsoft.Office.Interop.Excel">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>8</VersionMinor>
-      <VersionMajor>1</VersionMajor>
-      <Guid>00020813-0000-0000-c000-000000000046</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>true</EmbedInteropTypes>
-    </COMReference>
->>>>>>> Standortänderung
   </ItemGroup>
 
   <ItemGroup>