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 ea34258..64e0951 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
@@ -198,16 +198,16 @@ public class Path {
      * 
      * @return true if the path is valid, false otherwise.
      * 
-     * @deprecated Need to be implemented.
      */
     public boolean isValid() {
-        for (int i=0; i<arcs.size();i++){
+        boolean valid=true;
+        for (int i=0; i<arcs.size()-1;i++){
             if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
-                return false;
+                valid=false;
             
             }
         }
-        return true;
+        return valid;
     }
 
     /**
@@ -234,14 +234,6 @@ public class Path {
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
      * 
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-     *
-     *
->>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
->>>>>>> 661162456a46270c315c09521ce09f85f0020150
      */
     public double getTravelTime(double speed) {
         double TotalTime = 0;
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 2cf2275..9332aa9 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