diff --git a/main/Main.java b/main/Main.java
index 0e6b0de..b843336 100644
--- a/main/Main.java
+++ b/main/Main.java
@@ -19,11 +19,9 @@ import structure.Router;
 public class Main {
 
 	public static void main(String[] args) {
-<<<<<<< HEAD
+
 		Grid g=new Grid(Grid.Protocol.DSDV);
-=======
-		Grid g=new Grid(Grid.Protocol.AODV);
->>>>>>> bd27005eadf8c9526bf0167ea19a2d949bcca1f9
+
 
 		// Build Graph for graphstream
 		MyGraph gr=new MyGraph("Routage Oportuniste", g);