fix clock merge conflicts

frontend/src/app/components/clock/clock.component.html

@@ -20,7 +20,7 @@
           </ng-container>
           <ng-template #mempoolMode>
             <div class="block-sizer" [style]="blockSizerStyle">
-              <app-mempool-block-overview [index]="0"></app-mempool-block-overview>
+              <app-mempool-block-overview [index]="0" [pixelAlign]="true"></app-mempool-block-overview>
             </div>
           </ng-template>
           <div class="fader"></div>