- 
# Conflicts: # frontend/controllers/ServiceController.php 
- 
2
- 
# Conflicts: # frontend/views/layouts/main.php 
- 
# Conflicts: # frontend/controllers/SiteController.php # frontend/views/site/index.php 
- 
- prices - disable artboxmodal css 
# Conflicts: # frontend/controllers/ServiceController.php
# Conflicts: # frontend/views/layouts/main.php
# Conflicts: # frontend/controllers/SiteController.php # frontend/views/site/index.php
- prices - disable artboxmodal css