diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 9d06e26af..0bedf8b4d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -3187,12 +3187,9 @@
     <Resource Include="Ressources\Icons\Copy24.png" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
-=======
     <Resource Include="Ressources\Icons\CalendarDisabledUnderConstruction.png" />
   </ItemGroup>
   <ItemGroup>
->>>>>>> master
     <Resource Include="Ressources\Icons\AB.png" />
   </ItemGroup>
   <ItemGroup>