化干戈為玉帛

Idiom

 * 1) to turn hostility into friendship; to bury the hatchet