added travel to zone avoidance logic
fixed merge issues