Resolved Conflict with the web.xml