- 
# Conflicts: # frontend/views/account/wishlist.php 
- 
fixed 
- 
# Conflicts: # common/config/bootstrap.php 
- 
# Conflicts: # frontend/views/category/view.php 
# Conflicts: # frontend/views/account/wishlist.php
# Conflicts: # common/config/bootstrap.php
# Conflicts: # frontend/views/category/view.php