resolved merge confligt in register.jsp