Revert "Для решения конфликтов"

This reverts commit 2d65e57000bff2733796b8659ac961eb7824b71f.
Revert "Merge от 01.12"

This reverts commit 46881bbb137f88300c77e025cf57cba379d9dbb8.
енше