conciliate

verb

1. cause to be more favorably inclined; gain the good will of"She managed to mollify the angry customer"
2. come to terms"After some discussion we finally made up"
3. make (one thing) compatible with (another)"The scientists had to accommodate the new results with the existing theories"