settled conflict

• dispute which has been resolved, conflict which has ended