# Conflicts: # front/src/main/resources/static/assets/scripts/common.ui.js # front/src/main/resources/static/assets/styles/style.css
# Conflicts: # front/src/main/resources/static/assets/scripts/common.ui.js # front/src/main/resources/static/assets/styles/style.css