diff --git a/static/js/summary_preview.js b/static/js/summary_preview.js
index 87ac7d7..f343b02 100644
--- a/static/js/summary_preview.js
+++ b/static/js/summary_preview.js
@@ -45,6 +45,14 @@ document.getElementById("year").addEventListener("change", function () {
 
             // Show preview
             previewDiv.style.display = "block";
+<<<<<<< HEAD
+=======
+
+           
+
+            
+
+>>>>>>> a8e47af61c86ea9e13f18c0133e8c687573bf392
         })
         .catch(err => console.error("Preview load error:", err));
 });
diff --git a/templates/summary_reports.html b/templates/summary_reports.html
index e475d51..aee9f61 100644
--- a/templates/summary_reports.html
+++ b/templates/summary_reports.html
@@ -1,6 +1,13 @@
 {% extends "base.html" %} {% block title %}Download Summary Report{% endblock %}
 {% block extra_css %}
+<<<<<<< HEAD
 <link rel="stylesheet" href="{{ url_for('static', filename='css/summary.css') }}" />
+=======
+<link
+  rel="stylesheet"
+  href="{{ url_for('static', filename='css/summary.css') }}"
+/>
+>>>>>>> a8e47af61c86ea9e13f18c0133e8c687573bf392
 {% endblock %} {% block content %}
 <div class="container">
   <div class="head">
@@ -31,4 +38,8 @@
 </div>
 {% endblock %} {% block extra_js %}
 <script src="{{ url_for('static', filename='js/summary_preview.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<<<<<<< HEAD
+{% endblock %}
+=======
+{% endblock %}
+>>>>>>> a8e47af61c86ea9e13f18c0133e8c687573bf392