diff --git a/hdms/2024/index.html b/hdms/2024/index.html
index 60ad923..4a5bce7 100644
--- a/hdms/2024/index.html
+++ b/hdms/2024/index.html
@@ -139,12 +139,8 @@
 						<!-- <a href="generic.html">News</a> -->
 						<a href="#topics"><b>TOPICS</b></a>
 						<a href="#dates"><b>DATES</b></a>
-<<<<<<< HEAD
-						<a href="#program"><b>PROGRAM</b></a>
-=======
 						<a href="program.html"><b>PROGRAM</b></a>
 						<a href="posters.html"><b>POSTERS</b></a>
->>>>>>> 1905f77ee8224b723527ef07bbb30a95476bbf5d
 						<a href="#committee"><b>ORGANIZATION</b></a>
 						<a href="#registration"><b>REGISTRATION</b></a>
 						<!-- <a href="#student_awards"><b>STUDENT AWARDS</b></a> -->