diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index f67c74b0..2077205e 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -60,8 +60,3 @@ class MondeDiploBridge extends BridgeAbstract{
         return 21600; // 6 hours
     }
 }
-        
-<<<<<<< HEAD
-=======
-
->>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71