diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index acc663c9..79e4d5a1 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,5 +1,4 @@
 <footer class="d-flex justify-content-center">
-<<<<<<< HEAD
   <p class="footer-item">Copyright © 2025</p>
   <%= link_to "Lowell" , "https://www.lowell.k12.ma.us/" , class: "footer-item footer-link", target: "_blank" %>
 </footer>