diff --git a/.drone.yml b/.drone.yml
index 120495f..633b1bc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,7 +15,11 @@ steps:
       - cd LOLAPP/
       - dotnet restore LOLAPP.sln
       - dotnet build LOLAPP.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
+<<<<<<< HEAD
 
+=======
+      
+>>>>>>> 75d5a4a3eba8723843e8847e2242b0d8924654ba
   - name: unit-tests
     image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest
     commands: