diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css
index b9dfb105..caaf64d1 100755
--- a/themes/site_mobile/css/style.css
+++ b/themes/site_mobile/css/style.css
@@ -5363,6 +5363,9 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
   position: absolute;
   bottom: 12px;
   border-radius: 20px;
+<<<<<<< HEAD
   right: 0;
+=======
+>>>>>>> branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
   z-index: 10000;
 }