# Conflicts: # frontend/views/layouts/main.php
# Conflicts: # frontend/views/account/wishlist.php
fixed