Ellison and Benioff bury the hatchet and make nice