Revert "Conflicts was resolved"
Merge pull request #326 from EricpolUkraine/revert-325-development

Revert "Conflicts was resolved"