- 
# Conflicts: # frontend/views/accounts/general.php 
- 
# Conflicts: # backend/web/js/option.js # frontend/views/accounts/general.php # frontend/views/layouts/admin.php 
# Conflicts: # frontend/views/accounts/general.php
# Conflicts: # backend/web/js/option.js # frontend/views/accounts/general.php # frontend/views/layouts/admin.php