fixing broken stuff from merge

1 job for navigation in 2 minutes and 46 seconds (queued for 3 seconds)