diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 20506c637ee..60d4650921b 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -651,16 +651,11 @@ class pdf_sponge extends ModelePDFFactures
     	                    else
     	                    {
     	                        // We found a page break
-<<<<<<< HEAD
-    	                        $showpricebeforepagebreak = 0;
-=======
-
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else
 									$showpricebeforepagebreak = 0;
->>>>>>> branch '11.0' of git@github.com:Dolibarr/dolibarr.git
     	                    }
     	                }
     	                else	// No pagebreak