Fixed merge error on appengine-web.xml