changed again conflict jsp page

changed again conflict jsp page