translated into ukrainian
resolved conflict