diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 735ea06..c585636 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -221,14 +221,10 @@
     #sub_footer
 
       #logos
-<<<<<<< HEAD
         =link_to "https://groupe-payre.fr", :target => "_blank" do
           =image_tag "/logo.png"
 
-        =link_to "http://payreagri.quartz.xyz", :target => "_blank" do
-=======
         =link_to "https://payreagriculture.fr/", :target => "_blank" do
->>>>>>> a40f1bdf02595a6e4157ee5e35d4195487792f3c
           =image_tag "/payre-agriculture.png"
 
         =link_to "https://payreenergies.fr/", :target => "_blank" do