fix по задачам
merge
merge