merge conflicts

Author: Thunkar

yarn-project/aztec.js/src/api/protocol.ts

@@ -6,4 +6,4 @@ export { ContractClassRegistryContract } from '../contract/protocol_contracts/co
 export { ContractInstanceRegistryContract } from '../contract/protocol_contracts/contract-instance-registry.js';
 export { FeeJuiceContract } from '../contract/protocol_contracts/fee-juice.js';
 export { MultiCallEntrypointContract } from '../contract/protocol_contracts/multi-call-entrypoint.js';
-export { RouterContract } from '../contract/protocol_contracts/router.js';
+export { PublicChecksContract } from '../contract/protocol_contracts/public-checks.js';

yarn-project/aztec.js/src/wallet/wallet.ts

@@ -356,7 +356,7 @@ const WalletMethodSchemas = {
 };
 
 /**
- * Creates batch schemas from the individual wallet methods
+ * Creates batch schemas from the individual wallet methods.
  * This allows us to define them once and derive batch schemas automatically,
  * reducing duplication and ensuring consistency.
  */