log4j initialized
Merge conflict resolved: web.xml