A colleague you clashed with in the past wants to bury the hatchet. Say yes. You two should be playing on the same team.