Change project name in web.xml
Fixed merge conflicts