diff --git a/public/espace_perso.php b/public/espace_perso.php
index e6e14e7331d62408452be3b4cead62e24a72fd52..e9835315f7ed0b5c014ea7776c57a146499fc1dc 100644
--- a/public/espace_perso.php
+++ b/public/espace_perso.php
@@ -74,7 +74,7 @@ $listeCDCperso = $coupdecoeurRepository->fetchByIdUser($_SESSION["id_user"]);
 
   <div class="row">
 
-  <div class="col CoupDeCoeur">
+  <div class="col CoupDeCoeur" style="margin: 0px;">
     <h3 class="titre">Vos images coup de coeur :</h3>
     <!-- liste des coups de coeur de l'utilisateur -->
     <div id="CDCdisplayArea"><div class="spinner-border text-dark"></div></div>
@@ -82,7 +82,7 @@ $listeCDCperso = $coupdecoeurRepository->fetchByIdUser($_SESSION["id_user"]);
 
 
   <!-- bibliothèque personnelle des images notées par l'utilisateur -->
-  <div class="col Reviewed">
+  <div class="col Reviewed" style="margin: 0px;">
     <h3 class="titre">Les images que vous avez note :</h3>
     <div id="ReviewdisplayArea"><div class="spinner-border text-dark"></div></div>
     </div>
diff --git a/public/leaderboard.php b/public/leaderboard.php
index 4e10495281516fac1df5a223cb349ff848121c29..0deba60b25ae6aa83f02c9dac0de27aea191ccda 100644
--- a/public/leaderboard.php
+++ b/public/leaderboard.php
@@ -54,11 +54,7 @@ urlHasArgument();
 	generateNavBar('leaderboard');
 	?>
 	<!-- balises cachées contenant les images par ordre de notation -->
-<<<<<<< HEAD
 	<div id="NoteLeaderboard" style="display: none"> <!-- display: none -->
-=======
-	<div id="NoteLeaderboard" style="display:none"> <!-- display: none -->
->>>>>>> fe4f8bc2d8e0b89af8f7b3f8e536301fdd4af310
 		<?php
 			$test = $orderRepository->fetchAvgNoteOrder();