make tomcat work
merge conflict