Nikki Haley says she will vote for Donald Trump following their disputes during Republican primary