settle the lingering conflict Synonym