Trump folds on border wall money to end the government shutdown he started