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 c5d28dc..6ec8022 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
@@ -234,6 +234,17 @@ public class Path {
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
      * 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+=======
+<<<<<<< HEAD
+     *
+     *
+>>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
+>>>>>>> 661162456a46270c315c09521ce09f85f0020150
+>>>>>>> 534e0b728e13a532d629312ec48c8c6185679721
      */
     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 275e6e9..1895766 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