diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 1f81767f80d..3673f6df204 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -30,19 +30,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
  */
 class AccountancyCategory 	// extends CommonObject
 {
-<<<<<<< HEAD
-	/**
+    	/**
      	 * @var DoliDB Database handler.
      	 */
     	public $db;
-    
-=======
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
 
->>>>>>> upstream/develop
 	/**
 	 * @var string 		Error string
 	 * @see             errors
@@ -64,24 +56,69 @@ class AccountancyCategory 	// extends CommonObject
 	 */
 	public $table_element='c_accounting_category';
 
-	public $id;
-	public $code;
-	
 	/**
-     	 * @var string proper name for given parameter
+     	 * @var int ID
      	 */
+    	public $id;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $code;
+
+       /**
+     	* @var string proper name for given parameter
+     	*/
     	public $label;
-    
+
+    	/**
+	 * @var mixed Sample property 1
+	 */
 	public $range_account;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $sens;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $category_type;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $formula;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $position;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $fk_country;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $active;
 
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $lines_cptbk;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $lines_display;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $sdc;
 
 
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 08ae8359c96..1447ff0e7b4 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -79,35 +79,24 @@ class AccountingAccount extends CommonObject
 	var $account_number;
 	var $account_parent;
 	var $account_category;
-<<<<<<< HEAD
-	
-	/**
-     	 * @var string proper name for given parameter
+
+    	/**
+     	 * @var string Label of account
      	 */
     	public $label;
-    
-	var $fk_user_author;
-	var $fk_user_modif;
-	var $active;       // duplicate with status
-=======
 
-    /**
-     * @var string Label of account
-     */
-    public $label;
+    	/**
+    	 * @var int ID
+     	 */
+    	public $fk_user_author;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_author;
+    	/**
+     	 * @var int ID
+     	 */
+    	public $fk_user_modif;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
-
-    var $active;       // duplicate with status
->>>>>>> upstream/develop
+    	var $active;       // duplicate with status
+	
 	var $status;