diff --git a/PrototypWPFHAG/PrototypWPFHAG.csproj b/PrototypWPFHAG/PrototypWPFHAG.csproj
index ab1f43f..0db60b9 100644
--- a/PrototypWPFHAG/PrototypWPFHAG.csproj
+++ b/PrototypWPFHAG/PrototypWPFHAG.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-<<<<<<< HEAD
+
     <OutputType>WinExe</OutputType>
-=======
+
     <OutputType>Exe</OutputType>
->>>>>>> 37891877377e624f7138e6c6075bdf6cd8650a0e
+
     <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>