- 
# Conflicts: # common/config/bootstrap.php 
- 
# Conflicts: # frontend/views/category/view.php 
- 
# Conflicts: # frontend/views/layouts/main.php # frontend/web/css/custom.css 
# Conflicts: # common/config/bootstrap.php
# Conflicts: # frontend/views/category/view.php
# Conflicts: # frontend/views/layouts/main.php # frontend/web/css/custom.css