ignore target
thymeleaf and slf4j
merge changes
Revert "merge changes"

This reverts commit 93ca110d66e11ef0bf69222b21c3ce28c587db87.