peace over conflict