Fix rebase

solidity/contracts/middleware/InterchainAccountRouter.sol

@@ -218,7 +218,7 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         uint32 _origin,
         bytes32 _sender,
         bytes calldata _message
-    ) external override onlyMailbox {
+    ) external payable override onlyMailbox {
         (
             bytes32 _owner,
             bytes32 _ism,

solidity/test/isms/DomainRoutingIsm.t.sol

@@ -10,6 +10,7 @@ import {DefaultFallbackRoutingIsmFactory, DomainRoutingIsmFactory} from "../../c
 import {IInterchainSecurityModule} from "../../contracts/interfaces/IInterchainSecurityModule.sol";
 import {MessageUtils, TestIsm} from "./IsmTestUtils.sol";
 import {TestMailbox} from "../../contracts/test/TestMailbox.sol";
+import {TestPostDispatchHook} from "../../contracts/test/TestPostDispatchHook.sol";
 
 contract DomainRoutingIsmTest is Test {
     address private constant NON_OWNER =
@@ -99,7 +100,13 @@ contract DefaultFallbackRoutingIsmTest is DomainRoutingIsmTest {
     function setUp() public override {
         defaultIsm = deployTestIsm(bytes32(0));
         TestMailbox mailbox = new TestMailbox(1000);
-        mailbox.initialize(address(this), address(defaultIsm));
+        TestPostDispatchHook hook = new TestPostDispatchHook();
+        mailbox.initialize(
+            address(this),
+            address(defaultIsm),
+            address(hook),
+            address(hook)
+        );
 
         ism = new DefaultFallbackRoutingIsm(address(mailbox));
         ism.initialize(address(this));