diff --git a/server/src/bin/transform.rs b/server/src/bin/transform.rs
index 4af9c41c199e64af321e7d396fe9a0f05007b628..839f16dd15e6c7c511b562c3a69f562095598211 100644
--- a/server/src/bin/transform.rs
+++ b/server/src/bin/transform.rs
@@ -7,6 +7,10 @@ use server::map::{
 
 fn main() {
     let r = File::open(&std::path::Path::new("montreal.osm.pbf")).unwrap();
+<<<<<<< HEAD
+=======
+    let time = Instant::now();
+>>>>>>> 54fe160 (Initial commit)
 
     let mut pbf = osmpbfreader::OsmPbfReader::new(r);
     let mut map = Map::default();
@@ -17,10 +21,18 @@ fn main() {
     }
     map.build();
 
+<<<<<<< HEAD
     let time = Instant::now();
     println!(
         "{:#?} computed in {}s",
         map.get(PlaceOfInterest::Restaurant, -73.76915, 45.53415),
         time.elapsed().as_secs_f32()
     );
+=======
+    map.get(PlaceOfInterest::Restaurant, 45.53415, -73.76915);
+    // println!(
+    //     "{:#?} computed in {}s",
+    //     time.elapsed().as_secs_f32()
+    // );
+>>>>>>> 54fe160 (Initial commit)
 }