adding parameter in the servlet
merge conflict resolve
fix errors