diff --git a/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt b/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
index eada8e1..58f7887 100644
--- a/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
+++ b/app/src/main/java/eu/ztsh/garmin/data/MapboxMapper.kt
@@ -56,6 +56,8 @@ class MapboxMapper {
                         }
                     }
                 }
+                // TODO: implement
+                state.lanes = Lanes(Arrows(listOf()), Arrows(listOf()))
                 this.laneGuidance?.apply {
                     this.allLanes.apply {
                         println()
diff --git a/app/src/main/java/eu/ztsh/garmin/data/Model.kt b/app/src/main/java/eu/ztsh/garmin/data/Model.kt
index 82bffe6..ef30ede 100644
--- a/app/src/main/java/eu/ztsh/garmin/data/Model.kt
+++ b/app/src/main/java/eu/ztsh/garmin/data/Model.kt
@@ -136,7 +136,11 @@ class GarminManeuver : GarminModelItem {
     var flag: Boolean = false // WTF?
 
     override fun merge(item: GarminModelItem) {
-        TODO("Not yet implemented")
+        val maneuver = item as GarminManeuver
+        this.lanes = maneuver.lanes
+        this.direction = maneuver.direction
+        this.distance = maneuver.distance
+        this.flag = maneuver.flag
     }
 
     companion object {