diff --git a/lib/services.sh b/lib/services.sh
index 310e749..4aa9ff4 100644
--- a/lib/services.sh
+++ b/lib/services.sh
@@ -29,12 +29,8 @@ exec_serv()
 
     prnt I "Lancement de la commande $command du services $svcname"
     $lineexec
-<<<<<<< HEAD
-
-    unset lineexec
-=======
     return $?
->>>>>>> 0a2c9f5bc3d32cd765a3c67aa81e060c9ec28426
+    unset lineexec
 }
 export exec_serv