#bury the hatchet #conflict discarded #put it behind us #disagreement resolved #dropped the issue #argument thrown away