ок
Merge branch 'origin/master'
ок
Merge branch 'origin/master'