diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index e80c82ca6d0..d4d68dd1c02 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -88,11 +88,7 @@ $search_all=trim(GETPOST("search_all", 'alpha'));
 $search=array();
 foreach($object->fields as $key => $val)
 {
-<<<<<<< HEAD
     if (GETPOST('search_'.$key, 'alpha')) $search[$key]=GETPOST('search_'.$key, 'alpha');
-=======
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key]=GETPOST('search_'.$key, 'alpha');
->>>>>>> upstream/develop
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action='view';
@@ -127,11 +123,7 @@ if (empty($reshook))
 	if (empty($backtopage)) {
 	    if (empty($id)) $backtopage = $backurlforlist;
 	    else $backtopage = dol_buildpath('/bom/bom_card.php', 1).($id > 0 ? $id : '__ID__');
-<<<<<<< HEAD
     }
-=======
-	}
->>>>>>> upstream/develop
 	$triggermodname = 'BILLOFMATERIALS_BILLOFMATERIALS_MODIFY';	// Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, delete or clone