Added multi waypoint support via json file
Fix conflict