diff --git a/src/pages/mainAside.js b/src/pages/mainAside.js
index d20e007d0f3640b1a3a98df9ea0e6185101ca0d4..9e379d4b3879338c71d8f014b14bfb4d2fbc1e89 100644
--- a/src/pages/mainAside.js
+++ b/src/pages/mainAside.js
@@ -3,10 +3,6 @@ import styles from './mainAside.module.css';
 
 function NextSchedule(props) {
     const { nextSchedules } = props.data;
-<<<<<<< HEAD
-=======
-    
->>>>>>> 345bf12643aaa2ee3918a6502c96fa159a0886af
 
     if (!nextSchedules || !Array.isArray(nextSchedules)) {
         return <p className={styles.noContent}>다음 일정이 없습니다.</p>;
@@ -29,10 +25,6 @@ function NextSchedule(props) {
 
 function Notice(props){
     const { subscribeNotices } = props.data;
-<<<<<<< HEAD
-=======
-   
->>>>>>> 345bf12643aaa2ee3918a6502c96fa159a0886af
 
     if (!subscribeNotices || !Array.isArray(subscribeNotices)) {
         return <p className={styles.noContent}>최근 공지가 없습니다.</p>;
@@ -98,4 +90,4 @@ function Schedule(){
     )
 }
 
-export default Schedule;
\ No newline at end of file
+export default Schedule;