How golf’s warring factions finally swung a peace deal