update snapshot nd resolve merge conflict

Author: Netacci

src/__tests__/CompareResults/__snapshots__/ResultsTable.test.tsx.snap

@@ -373,11 +373,11 @@ exports[`Results Table Should match snapshot 1`] = `
                                     />
                                   </svg>
                                   <div
-                                    aria-label="Mar 29, 51, 00:00 UTC"
+                                    aria-label="Mar 29, 51, 24:00 UTC"
                                     class=""
                                     data-mui-internal-clone-element="true"
                                   >
-                                    Mar 29, 51, 00:00 UTC
+                                    Mar 29, 51, 24:00 UTC
                                   </div>
                                 </div>
                               </div>
@@ -661,11 +661,11 @@ exports[`Results Table Should match snapshot 1`] = `
                                     />
                                   </svg>
                                   <div
-                                    aria-label="Mar 29, 51, 00:00 UTC"
+                                    aria-label="Mar 29, 51, 24:00 UTC"
                                     class=""
                                     data-mui-internal-clone-element="true"
                                   >
-                                    Mar 29, 51, 00:00 UTC
+                                    Mar 29, 51, 24:00 UTC
                                   </div>
                                 </div>
                               </div>