diff --git a/src/main/java/com/mca/util/ImgPaginationRenderer.java b/src/main/java/com/mca/util/ImgPaginationRenderer.java
index b9775ab..f8c281c 100644
--- a/src/main/java/com/mca/util/ImgPaginationRenderer.java
+++ b/src/main/java/com/mca/util/ImgPaginationRenderer.java
@@ -74,23 +74,6 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
 				</nav>
 			*/
 	public void initVariables() {
-<<<<<<< HEAD
-
-		firstPageLabel = "";//"<li><a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
-		previousPageLabel = "<li>\n" +
-				"\t\t\t\t\t  <a href=\"#\" aria-label=\"Previous\">\n" +
-				"\t\t\t\t\t\t<span aria-hidden=\"true\">&laquo;</span>\n" +
-				"\t\t\t\t\t  </a>\n" +
-				"\t\t\t\t\t</li>";
-		currentPageLabel = "<strong>{0}</strong>&#160;";
-		otherPageLabel = "<li><a href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a></li>";
-		nextPageLabel = "<li>\n" +
-				"\t\t\t\t\t  <a href=\"#\" aria-label=\"Next\">\n" +
-				"\t\t\t\t\t\t<span aria-hidden=\"true\">&raquo;</span>\n" +
-				"\t\t\t\t\t  </a>\n" +
-				"\t\t\t\t\t</li>";
-		lastPageLabel = "";//"<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_next10.gif' border=0/></a>&#160;";
-=======
 		// firstPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
 		firstPageLabel = "";//"<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
 		previousPageLabel = "<li class=\"page-item\">\n" +
@@ -106,7 +89,6 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
 				"\t\t\t\t\t  </a>\n" +
 				"\t\t\t\t\t</li>";
 		lastPageLabel = "";//""<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_next10.gif' border=0/></a>&#160;";
->>>>>>> fe79f99402336104ee1532a6190dfbcb6ec1d1e3
 	}
 
 	@Override