add edit index.jsp
conflic resolve