conciliate

To make peace and fix hurt feelings after a fight.