- 
Conflicts: frontend/views/accounts/employment.php frontend/web/css/style.css 
- 
# Conflicts: # frontend/views/accounts/employment.php 
- 
# Conflicts: # common/models/User.php 
Conflicts: frontend/views/accounts/employment.php frontend/web/css/style.css
# Conflicts: # frontend/views/accounts/employment.php
# Conflicts: # common/models/User.php