diff --git a/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig b/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
index 5dd6961..736533c 100644
--- a/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
+++ b/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
@@ -39,11 +39,7 @@
  * @see html.html.twig
  */
 #}
-<<<<<<< HEAD
 <div class="layout-container " id="ressources">
-=======
-<div class="layout-container" id="ressources">
->>>>>>> prod
 
   <header role="banner">
     {{ page.header_left }}