Ford, UAW resolve dispute at F-150 plant, ending strike threat