Colombia’s air-traffic control dispute resolved, flights resume