diff --git a/htdocs/ticketsup/class/actions_ticketsup.class.php b/htdocs/ticketsup/class/actions_ticketsup.class.php
index a98f3ecf15d..c87264098ef 100644
--- a/htdocs/ticketsup/class/actions_ticketsup.class.php
+++ b/htdocs/ticketsup/class/actions_ticketsup.class.php
@@ -976,14 +976,10 @@ class ActionsTicketsup
     }
 
     /**
-     * print statut
-<<<<<<< HEAD
+     * Print statut
      *
-     * @param		int		$mode		Mode
-=======
-     * @param int $mode Display mode
->>>>>>> branch 'develop' of git@github.com:Dolibarr/dolibarr.git
-     * @return void
+     * @param		int		$mode		Display mode
+     * @return 		void
      */
     public function getLibStatut($mode = 0)
     {