settle the ongoing conflict Synonym