Fixed conflict in web.xml