# Conflicts: # src/main/java/com/example/FreeMarket/controller/SalasController.java # src/main/resources/templates/index.ftl
