diff --git a/templates/ledger/reports/components/period_navigator.html b/templates/ledger/reports/components/period_navigator.html
index 747eabad..4edf6f22 100644
--- a/templates/ledger/reports/components/period_navigator.html
+++ b/templates/ledger/reports/components/period_navigator.html
@@ -16,7 +16,6 @@
         <!-- Year Navigation -->
         <div class="text-center mb-3">
             <p class="mb-1">
-<<<<<<< HEAD
                 <span class="fw-bold">Year: </span>
                 <a href="{{ previous_year_url }}" class="text-decoration-none me-2">
                     <span class="fas fa-chevron-left"> </span>
@@ -27,12 +26,6 @@
                     <span class="fas fa-chevron-right"> </span>
                     <span class="fas fa-chevron-right"> </span>
                 </a>
-=======
-                <span class="fw-bold">{% trans 'Year' %}:</span>
-                <a href="{{ previous_year_url }}" class="text-decoration-none me-2"><< {{ previous_year }}</a>
-                <a href="{{ current_year_url }}" class="text-decoration-none me-2">{{ year }}</a>
-                <a href="{{ next_year_url }}" class="text-decoration-none">{{ next_year }} >></a>
->>>>>>> a4433631fb8ac35fdea38581ddea53fbba7115e4
             </p>
         </div>        
 
@@ -79,12 +72,5 @@
         </div>
 
         <!-- Date Picker -->
-<<<<<<< HEAD
-        
-=======
-        <div class="text-center ">
-            {% date_picker date_navigation_url %}
-        </div>
->>>>>>> a4433631fb8ac35fdea38581ddea53fbba7115e4
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/ledger/reports/dashboard.html b/templates/ledger/reports/dashboard.html
index 7c834496..922e51f3 100644
--- a/templates/ledger/reports/dashboard.html
+++ b/templates/ledger/reports/dashboard.html
@@ -208,7 +208,6 @@
                           <div class="fw-normal text-body-highlight title"> <span class="fa-solid fa-clock-rotate-left" data-fa-transform="shrink-2"></span> MacBook Air - 13″</div>
                         </div>
                       </a>
-
                     </div>
                     <hr class="my-0" />
                     <h6 class="dropdown-header text-body-highlight fs-9 border-bottom border-translucent py-2 lh-sm">Products</h6>
@@ -242,7 +241,6 @@
                           <div class="fw-normal text-body-highlight title"> <span class="fa-solid fa-link text-body" data-fa-transform="shrink-2"></span> Store MacBook″</div>
                         </div>
                       </a>
-
                     </div>
                     <hr class="my-0" />
                     <h6 class="dropdown-header text-body-highlight fs-9 border-bottom border-translucent py-2 lh-sm">Files</h6>