add more parameters in servlet
merge conflict resolve