- 
# Conflicts: # frontend/controllers/AccountsController.php
 
- 
Conflicts: frontend/views/layouts/main.php
 - 
Conflicts: common/config/.gitignore
 
# Conflicts: # frontend/controllers/AccountsController.php
Conflicts: frontend/views/layouts/main.php
Conflicts: common/config/.gitignore