- 
Conflicts: frontend/controllers/SiteController.php frontend/views/layouts/main.php frontend/views/site/index.php
 
- 
# Conflicts: # common/messages/ru/app.php
 
Conflicts: frontend/controllers/SiteController.php frontend/views/layouts/main.php frontend/views/site/index.php
# Conflicts: # common/messages/ru/app.php