Fixed merge conflict at index.jsp