diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9aca90d9b6d..f84f8652f96 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1313,7 +1313,6 @@ if ($resql)
 
 	if ($action == 'validate') {
 		if (GETPOST('confirm') == 'yes') {
-<<<<<<< HEAD
 			$tmpproposal = new Propal($db);
 			foreach ($toselect as $checked) {
 				$tmpproposal->fetch($checked);
@@ -1323,56 +1322,17 @@ if ($resql)
 						setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs');
 					} else {
 						setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors');
-=======
-			foreach ($toselect as $checked) {
-				$sql = "SELECT ref, fk_statut AS status FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$checked;
-				$resql = $db->query($sql);
-				if ($resql){
-					$obj = $db->fetch_object($resql);
-					$ref = substr($obj->ref, 1, 4);
-					if ($ref == 'PROV') {
-						$numref = $object->getNextNumRef($soc);
-						if (empty($numref)) {
-							setEventMessages($object->error, $object->errors, 'errors');
-						}
-					} else {
-						$numref = $obj->ref;
 					}
-					if ($obj->status == 0){
-						$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 1, ref ='".$numref."' WHERE rowid = ".$checked;
-						$resql = $db->query($sql);
-						if ($resql){
-							setEventMessage($numref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
-						} else {
-							dol_print_error($db);
-						}
-					}else {
-						setEventMessage($numref." ".$langs->trans('IsNotADraft'), 'errors');
->>>>>>> d913736bd1a6850d32bfe81bd958e3e17984100e
-					}
-				} else {
-					dol_print_error($db);
 				}
 			}
-		}
-	}
 
 	if ($action == "sign") {
 		if (GETPOST('confirm') == 'yes') {
-<<<<<<< HEAD
 			$tmpproposal = new Propal($db);
 			foreach ($toselect as $checked) {
 				$tmpproposal->fetch($checked);
 				if ($tmpproposal->fetch($checked)) {
 					if ($tmpproposal->statut == 1) {
-=======
-			foreach ($toselect as $checked) {
-				$sqlp = "SELECT ref, fk_statut AS status FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " . $checked;
-				$resqlp = $db->query($sqlp);
-				if ($resqlp) {
-					$objp = $db->fetch_object($resqlp);
-					if ($objp->status == 1) {
->>>>>>> d913736bd1a6850d32bfe81bd958e3e17984100e
 						$sqlp = "UPDATE " . MAIN_DB_PREFIX . "propal SET fk_statut = 2 WHERE rowid = " . $checked;
 						$resqlp = $db->query($sqlp);
 						if ($resqlp) {