diff --git a/requirements.txt b/requirements.txt
index 769db82f00dcb80e1c33796f56bc30a7f21d5c02..7b79ed9d04c61bbeb96f9ce4a18ce3a0eafef6e0 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,8 +16,5 @@ pyyaml==3.12
 cvxopt==1.2.0
 plotly==4.2.1
 matplotlib==3.1.1
-<<<<<<< HEAD
 -e git+https://gitlab.lis-lab.fr/dominique.benielli/multiviewmetriclearning
-=======
 tabulate==0.8.6
->>>>>>> develop