reconcile

[1]	accommodate , get/bring (back) together , unite , conciliate , reunite , settle/resolve differences between , restore harmony between , make peace between , placate , make compatible
[2]	resign , harmonize , harmonise , submit , accommodate , adjust
[3]	patch up , make up , conciliate , settle
[4]	resign , submit