Remove merging errors on index.jsp