diff --git a/Sources/BowlingApi/BowlingApi.csproj b/Sources/BowlingApi/BowlingApi.csproj
index 46c83c3..3ae707a 100644
--- a/Sources/BowlingApi/BowlingApi.csproj
+++ b/Sources/BowlingApi/BowlingApi.csproj
@@ -27,19 +27,11 @@
         
     </ItemGroup>
 
-<<<<<<< HEAD
-=======
     <ItemGroup>
       <None Remove="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
       <None Remove="Microsoft.EntityFrameworkCore.SqlServer" />
       <None Remove="Microsoft.EntityFrameworkCore.Tools" />
       <None Remove="Microsoft.EntityFrameworkCore.Sqlite" />
     </ItemGroup>
-    <ItemGroup>
-      <None Update="bowling.db">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
 
->>>>>>> origine/Branche1
 </Project>