Fixed miles
Fixed merge