Conflicts: frontend/views/accounts/general.php
# Conflicts: # frontend/controllers/AccountsController.php