diff --git a/tests/e2e/tracehandler_testdata/consumer-double-sign.json b/tests/e2e/tracehandler_testdata/consumer-double-sign.json
index d1a7ae065f..d6d1fc7086 100644
--- a/tests/e2e/tracehandler_testdata/consumer-double-sign.json
+++ b/tests/e2e/tracehandler_testdata/consumer-double-sign.json
@@ -37,8 +37,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -72,8 +71,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": {
@@ -117,8 +115,7 @@
         "ProviderKeys": {
           "carol": "cosmosvalcons1ezyrq65s3gshhx5585w6mpusq3xsj3ayzf4uv6"
         },
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -162,8 +159,7 @@
         "ProviderKeys": {
           "carol": "cosmosvalcons1ezyrq65s3gshhx5585w6mpusq3xsj3ayzf4uv6"
         },
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -199,8 +195,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": {
@@ -258,8 +253,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -277,8 +271,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -328,8 +321,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -351,8 +343,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -378,8 +369,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -401,8 +391,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -431,8 +420,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -454,8 +442,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
diff --git a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json
index 717761327d..028637934f 100644
--- a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json
+++ b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json
@@ -31,8 +31,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -66,8 +65,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": {
@@ -111,8 +109,7 @@
         "ProviderKeys": {
           "alice": "cosmosvalcons1qmq08eruchr5sf5s3rwz7djpr5a25f7xw4mceq"
         },
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -146,8 +143,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": {
@@ -193,8 +189,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -211,8 +206,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -263,8 +257,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -281,8 +274,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -310,8 +302,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -351,8 +342,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -372,8 +362,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -401,8 +390,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": null,
         "Proposals": null
@@ -422,8 +410,7 @@
         "ConsumerChains": null,
         "AssignedKeys": null,
         "ProviderKeys": null,
-        "ConsumerChainQueueSizes": null,
-        "GlobalSlashQueueSize": null,
+        "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
         "ClientsFrozenHeights": {
           "07-tendermint-0": {
diff --git a/tests/e2e/tracehandler_testdata/democracy.json b/tests/e2e/tracehandler_testdata/democracy.json
index 729dd35005..3a9ab84a96 100644
--- a/tests/e2e/tracehandler_testdata/democracy.json
+++ b/tests/e2e/tracehandler_testdata/democracy.json
@@ -610,10 +610,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
-<<<<<<< HEAD
         "ClientsFrozenHeights": null,
-=======
->>>>>>> main
         "Proposals": {
           "1": {
             "RawProposal": {
diff --git a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json
index c9e36b15b6..74df5293b9 100644
--- a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json
+++ b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json
@@ -610,10 +610,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
-<<<<<<< HEAD
         "ClientsFrozenHeights": null,
-=======
->>>>>>> main
         "Proposals": {
           "1": {
             "RawProposal": {
diff --git a/tests/e2e/tracehandler_testdata/happyPath.json b/tests/e2e/tracehandler_testdata/happyPath.json
index ee62446065..7c26f5c274 100644
--- a/tests/e2e/tracehandler_testdata/happyPath.json
+++ b/tests/e2e/tracehandler_testdata/happyPath.json
@@ -1358,69 +1358,6 @@
     }
   },
   {
-<<<<<<< HEAD
-=======
-    "ActionType": "main.submitEquivocationProposalAction",
-    "Action": {
-      "Chain": "consu",
-      "Height": 10,
-      "Time": "2023-10-04T12:14:14.883367+02:00",
-      "Power": 500,
-      "Validator": "bob",
-      "Deposit": 10000001,
-      "From": "bob"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 495
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": {
-          "bob": 9500000000
-        },
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 495
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Title": "",
-              "Description": "",
-              "Deposit": 0,
-              "Status": ""
-            },
-            "Type": "main.TextProposal"
-          }
-        }
-      }
-    }
-  },
-  {
->>>>>>> main
     "ActionType": "main.doublesignSlashAction",
     "Action": {
       "Validator": "carol",
@@ -1507,313 +1444,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
-<<<<<<< HEAD
         "ClientsFrozenHeights": null,
-=======
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.doublesignSlashAction",
-    "Action": {
-      "Validator": "bob",
-      "Chain": "consu"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.submitEquivocationProposalAction",
-    "Action": {
-      "Chain": "consu",
-      "Height": 10,
-      "Time": "2023-10-04T12:14:14.88337+02:00",
-      "Power": 500,
-      "Validator": "bob",
-      "Deposit": 10000001,
-      "From": "bob"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": {
-          "bob": 9489999999
-        },
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Height": 10,
-              "Power": 500,
-              "ConsensusAddress": "cosmosvalcons1nx7n5uh0ztxsynn4sje6eyq2ud6rc6klc96w39",
-              "Deposit": 10000001,
-              "Status": "PROPOSAL_STATUS_VOTING_PERIOD"
-            },
-            "Type": "main.EquivocationProposal"
-          }
-        }
-      }
-    }
-  },
-  {
-    "ActionType": "main.voteGovProposalAction",
-    "Action": {
-      "Chain": "provi",
-      "From": [
-        "alice",
-        "bob",
-        "carol"
-      ],
-      "Vote": [
-        "yes",
-        "yes",
-        "yes"
-      ],
-      "PropNumber": 2
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Height": 10,
-              "Power": 500,
-              "ConsensusAddress": "cosmosvalcons1nx7n5uh0ztxsynn4sje6eyq2ud6rc6klc96w39",
-              "Deposit": 10000001,
-              "Status": "PROPOSAL_STATUS_PASSED"
-            },
-            "Type": "main.EquivocationProposal"
-          }
-        }
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
->>>>>>> main
         "Proposals": null
       }
     }
diff --git a/tests/e2e/tracehandler_testdata/shorthappy.json b/tests/e2e/tracehandler_testdata/shorthappy.json
index a9dc42e18c..85e96aeed1 100644
--- a/tests/e2e/tracehandler_testdata/shorthappy.json
+++ b/tests/e2e/tracehandler_testdata/shorthappy.json
@@ -929,69 +929,6 @@
     }
   },
   {
-<<<<<<< HEAD
-=======
-    "ActionType": "main.submitEquivocationProposalAction",
-    "Action": {
-      "Chain": "consu",
-      "Height": 10,
-      "Time": "2023-10-04T12:14:14.883385+02:00",
-      "Power": 500,
-      "Validator": "bob",
-      "Deposit": 10000001,
-      "From": "bob"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 495
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": {
-          "bob": 9500000000
-        },
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 495
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Title": "",
-              "Description": "",
-              "Deposit": 0,
-              "Status": ""
-            },
-            "Type": "main.TextProposal"
-          }
-        }
-      }
-    }
-  },
-  {
->>>>>>> main
     "ActionType": "main.doublesignSlashAction",
     "Action": {
       "Validator": "carol",
@@ -1078,313 +1015,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
-<<<<<<< HEAD
         "ClientsFrozenHeights": null,
-=======
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.doublesignSlashAction",
-    "Action": {
-      "Validator": "bob",
-      "Chain": "consu"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      }
-    }
-  },
-  {
-    "ActionType": "main.submitEquivocationProposalAction",
-    "Action": {
-      "Chain": "consu",
-      "Height": 10,
-      "Time": "2023-10-04T12:14:14.883388+02:00",
-      "Power": 500,
-      "Validator": "bob",
-      "Deposit": 10000001,
-      "From": "bob"
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": {
-          "bob": 9489999999
-        },
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Height": 10,
-              "Power": 500,
-              "ConsensusAddress": "cosmosvalcons1nx7n5uh0ztxsynn4sje6eyq2ud6rc6klc96w39",
-              "Deposit": 10000001,
-              "Status": "PROPOSAL_STATUS_VOTING_PERIOD"
-            },
-            "Type": "main.EquivocationProposal"
-          }
-        }
-      }
-    }
-  },
-  {
-    "ActionType": "main.voteGovProposalAction",
-    "Action": {
-      "Chain": "provi",
-      "From": [
-        "alice",
-        "bob",
-        "carol"
-      ],
-      "Vote": [
-        "yes",
-        "yes",
-        "yes"
-      ],
-      "PropNumber": 2
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 500,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": {
-          "2": {
-            "RawProposal": {
-              "Height": 10,
-              "Power": 500,
-              "ConsensusAddress": "cosmosvalcons1nx7n5uh0ztxsynn4sje6eyq2ud6rc6klc96w39",
-              "Deposit": 10000001,
-              "Status": "PROPOSAL_STATUS_PASSED"
-            },
-            "Type": "main.EquivocationProposal"
-          }
-        }
-      }
-    }
-  },
-  {
-    "ActionType": "main.relayPacketsAction",
-    "Action": {
-      "ChainA": "provi",
-      "ChainB": "consu",
-      "Port": "provider",
-      "Channel": 0
-    },
-    "State": {
-      "consu": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
-        "Proposals": null
-      },
-      "provi": {
-        "ValBalances": null,
-        "ValPowers": {
-          "alice": 509,
-          "bob": 0,
-          "carol": 0
-        },
-        "StakedTokens": null,
-        "Params": null,
-        "Rewards": null,
-        "ConsumerChains": null,
-        "AssignedKeys": null,
-        "ProviderKeys": null,
-        "ConsumerPendingPacketQueueSize": null,
-        "RegisteredConsumerRewardDenoms": null,
->>>>>>> main
         "Proposals": null
       }
     }
diff --git a/tests/e2e/tracehandler_testdata/slashThrottle.json b/tests/e2e/tracehandler_testdata/slashThrottle.json
index 181fb4716e..dbca351d49 100644
--- a/tests/e2e/tracehandler_testdata/slashThrottle.json
+++ b/tests/e2e/tracehandler_testdata/slashThrottle.json
@@ -657,6 +657,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,
+        "ClientsFrozenHeights": null,
         "Proposals": null
       }
     }
@@ -678,6 +679,7 @@
         "ProviderKeys": null,
         "ConsumerPendingPacketQueueSize": 1,
         "RegisteredConsumerRewardDenoms": null,
+        "ClientsFrozenHeights": null,
         "Proposals": null
       },
       "provi": {