diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
index 173581a..5b228ce 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
@@ -200,18 +200,12 @@ public class Path {
      * 
      */
     public boolean isValid() {
-<<<<<<< HEAD
         boolean valid=true;
         for (int i=0; i<arcs.size()-1;i++){
             if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
                 valid=false;
-            
-=======
-        for (int i=0; i<arcs.size()-1;i++){
-            if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
-                return false;
->>>>>>> 9512825678cb119a068d94f8af261d356638dbdd
             }
+        
         }
         return valid;
     }
diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class
index 06cd0d3..667634c 100644
Binary files a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class and b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class differ