diff --git a/bridges/MondeDiploBridge.php b/bridges/MondeDiploBridge.php
index 38f843b..f67c74b 100644
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@@ -61,3 +61,7 @@ class MondeDiploBridge extends BridgeAbstract{
     }
 }
         
+<<<<<<< HEAD
+=======
+
+>>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71
diff --git a/bridges/ScoopItBridge.php b/bridges/ScoopItBridge.php
index a690bd7..d8d7127 100644
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@@ -45,3 +45,4 @@ class ScoopItBridge extends BridgeAbstract{
         return 21600; // 6 hours
     }
 }
+
diff --git a/bridges/WhydBridge.php b/bridges/WhydBridge.php
index d2c596d..9bac7a0 100644
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@@ -63,3 +63,4 @@ class WhydBridge extends BridgeAbstract{
 	}
 }
 
+