diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 82e61271..3088d62f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -3,6 +3,15 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <html lang="ko">
 <head>
+<<<<<<< HEAD
+=======
+ 	<!-- css -->
+	
+
+	<!-- script -->
+	
+<link rel="stylesheet" href="/ipedu/visitEdu/usr/publish/css/main.css">	
+>>>>>>> branch 'master' of http://tolag3@vcs.iten.co.kr:9999/itnAdmin/koipa_edu_2025-1
 <link rel="stylesheet" href="/ipedu/visitEdu/usr/publish/css/swiper.min.css">
 <script src="/ipedu/visitEdu/usr/publish/script/swiper.js"></script>
 <script type="text/javascript">
