President Trump said on the campaign trail that he could end the 'ridiculous' conflict within 24 hours of taking office. That has not happened