an existence problem in login_servlet
Merge error fixed.