Merge fix: add EncouterForm to web.xml