diff --git a/resources/css/style.css b/resources/css/style.css
index 8c252cc27..fb27e8c95 100755
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -3282,7 +3282,6 @@ input#archiveInd {
     margin-bottom: 10px;
 }
 
-<<<<<<< HEAD
 /*--- Icons align in ProductsDetails ---*/
 .alignIcons{
 	display: flex;