- 
# Conflicts: # common/models/LoginForm.php 
- 
# Conflicts: # frontend/views/product/view.php 
- 
# Conflicts: # frontend/views/layouts/main.php 
- 
# Conflicts: # frontend/views/account/wishlist.php 
# Conflicts: # common/models/LoginForm.php
# Conflicts: # frontend/views/product/view.php
# Conflicts: # frontend/views/layouts/main.php
# Conflicts: # frontend/views/account/wishlist.php