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