diff --git a/be-graphes-model/.gitignore b/be-graphes-model/.gitignore
index b83d222..a233b5c 100644
--- a/be-graphes-model/.gitignore
+++ b/be-graphes-model/.gitignore
@@ -1 +1,2 @@
 /target/
+*.class
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 64e0951..173581a 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,11 +200,17 @@ 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;
@@ -234,6 +240,20 @@ public class Path {
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
      * 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+=======
+<<<<<<< HEAD
+     *
+     *
+>>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
+>>>>>>> 661162456a46270c315c09521ce09f85f0020150
+>>>>>>> 534e0b728e13a532d629312ec48c8c6185679721
+>>>>>>> 9512825678cb119a068d94f8af261d356638dbdd
      */
     public double getTravelTime(double speed) {
         double TotalTime = 0;
@@ -252,8 +272,11 @@ public class Path {
      * @deprecated Need to be implemented.
      */
     public double getMinimumTravelTime() {
-        // TODO:
-        return 0;
+        double minTime = 0;
+        for (Arc a : arcs){
+            minTime += a.getMinimumTravelTime();
+        }
+        return minTime;
     }
 
 }
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 9332aa9..06cd0d3 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