Thymeleaf Template Resolved , Spring config file updated and Controller modified
Deleted unnecessary files
conflicts resolved