diff --git a/NLoop.Server/NLoop.Server.fsproj b/NLoop.Server/NLoop.Server.fsproj
index 6efa938..51b4da5 100644
--- a/NLoop.Server/NLoop.Server.fsproj
+++ b/NLoop.Server/NLoop.Server.fsproj
@@ -6,7 +6,6 @@
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
     <Version>2.0.0.3-beta</Version>
->>>>>>> Stashed changes
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>