Rory and Horschel feud over

Rory McIlroy appears to have settled his differences with Billy Horschel after playing a practice round with the American ahead of the US Open.