# Conflicts: # admin/src/main/resources/static/assets/styles/style.css # admin/src/main/resources/templates/home.html