conciliate
     v 1: cause to be more favorably inclined; gain the good will of;
          "She managed to mollify the angry customer" [syn: {pacify},
           {lenify}, {assuage}, {appease}, {mollify}, {placate}, {gentle},
           {gruntle}]
     2: come to terms; "After some discussion we finally made up"
        [syn: {reconcile}, {patch up}, {make up}, {settle}]
     3: make compatible with; "The scientists had to accommodate the
        new results with the existing theories" [syn: {accommodate},
         {reconcile}]
Source: WordNet® 2.0