diff --git a/src/components/pages/Timeline/index.tsx b/src/components/pages/Timeline/index.tsx
index 9d719d444ccdfd2a2428b550076bde24e90cd834..b0ef40b789c9a93deb85ce5112180e83faba0db2 100644
--- a/src/components/pages/Timeline/index.tsx
+++ b/src/components/pages/Timeline/index.tsx
@@ -2,11 +2,8 @@ import React from "react";
 import MyBreadcrumbs from "components/atoms/MyBreadcrumbs";
 import styles from "./style.module.scss";
 import TermSwitcher from "./components/TermSwitcher";
-<<<<<<< Updated upstream
 import ModuleHeading from "./components/ModuleHeading";
-=======
 import WeekHeading from "./components/WeekHeading";
->>>>>>> Stashed changes
 
 interface TimelineProps {
   initSideBar: () => void;