diff --git a/src/pages/student/mod.rs b/src/pages/student/mod.rs
index be3a804..b357fea 100644
--- a/src/pages/student/mod.rs
+++ b/src/pages/student/mod.rs
@@ -11,10 +11,7 @@ mod form_setup;
 mod home_page;
 mod shell;
 mod specific_requirements_page;
-<<<<<<< feat/applicants-page
-=======
 mod test_display;
->>>>>>> main
 mod university_page;
 mod work_experience_page;
 
@@ -30,9 +27,6 @@ pub use financial_page::*;
 pub use home_page::*;
 pub use shell::*;
 pub use specific_requirements_page::*;
-<<<<<<< feat/applicants-page
-=======
 pub use test_display::*;
->>>>>>> main
 pub use university_page::*;
 pub use work_experience_page::*;