# Conflicts:
#   src/main/java/com/roshka/proyectofinal/ProtectedResource.java
#   src/main/webapp/index.html