diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index 4f0853e1e39..abca3e17fb3 100755
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -1,6 +1,7 @@
 --
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 -- $Id: 3.0.0-3.1.0.sql,v 1.75 2011/06/28 07:47:10 eldy Exp $
 =======
 -- $Id: 3.0.0-3.1.0.sql,v 1.77 2011/06/29 11:22:35 eldy Exp $
@@ -8,6 +9,9 @@
 =======
 -- $Id: 3.0.0-3.1.0.sql,v 1.78 2011/06/29 17:55:32 eldy Exp $
 >>>>>>> refs/heads/origin
+=======
+-- $Id: 3.0.0-3.1.0.sql,v 1.78 2011/06/29 17:55:32 eldy Exp $
+>>>>>>> refs/heads/origin
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
@@ -452,9 +456,14 @@ ALTER TABLE llx_c_typent          ADD COLUMN module        varchar(32) NULL;
 
 ALTER TABLE llx_user ADD signature text DEFAULT NULL AFTER email;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> refs/heads/origin
 =======
 ALTER TABLE llx_don ADD   phone_mobile    varchar(24) after email;
 ALTER TABLE llx_don ADD   phone           varchar(24) after email;
 >>>>>>> refs/heads/origin
+=======
+ALTER TABLE llx_don ADD   phone_mobile    varchar(24) after email;
+ALTER TABLE llx_don ADD   phone           varchar(24) after email;
+>>>>>>> refs/heads/origin