sort out the conflict Synonym