chore: post-merge fixes

Author: zone117x

docs/generated.d.ts

@@ -1176,16 +1176,12 @@ export interface Block {
    * Execution cost write length.
    */
   execution_cost_write_length: number;
-<<<<<<< HEAD
   /**
    * List of txs counts in each accepted microblock
    */
   microblock_tx_count: {
     [k: string]: number | undefined;
   };
-  [k: string]: unknown | undefined;
-=======
->>>>>>> master
 }
 /**
  * Error