diff --git a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
index 7c02a0b4..9a69f435 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
@@ -90,17 +90,12 @@
 		<script src="/js/smartPop.js"></script>
 		<script src="/js/seed.common.js"></script>
 		<script src="/js/seed.tab.js"></script> -->
-<<<<<<< HEAD
-		<script src="/js/seed/seed.app.js"></script>
-		<script src="/js/seed/lib/jquery.bxslider.min.js"></script>
-		<script src="/js/seed/commonFileUtil.js"></script>
-		<script src="/js/seed/common_XHR.js"></script>
-		<script src="/js/seed/jquery.selectboxes.js"></script>
-=======
 		<script src="/js/seed.app.js"></script>
 		<script src="/js/lib/jquery.bxslider.min.js"></script>
 		<script src="/js/commonFileUtil.js"></script>
->>>>>>> refs/heads/tolag3
+		<script src="/js/common_XHR.js"></script>
+		<script src="/js/jquery.selectboxes.js"></script>
+
 		<!-- <script src="/js/jquery.form.js"></script>
 		
 		<script src="/js/common.js"></script>