translated
translated
resolve conlict