diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 409aa2daf00..a8170935eb0 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -33,20 +33,11 @@ class mod_ticket_universal extends ModeleNumRefTicket
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     /**
      * @var string Error code (or message)
      */
-=======
->>>>>>> upstream/develop
-=======
-    /**
-     * @var string Error code (or message)
-     */
->>>>>>> d5003c9d3c507b5064a1f8e96a1ae9a019b6a5e9
     public $error = '';
 
     /**