resolve all

tests/integration_tests/configs/default.jsonnet

@@ -4,13 +4,6 @@
     cmd: 'laconicd',
     'start-flags': '--trace',
     config: {
-<<<<<<< HEAD
-      consensus: {
-        // larger timeout for more stable mempool tests
-        timeout_commit: '2s',
-      },
-=======
->>>>>>> v0.21.0
       mempool: {
         // use v1 mempool to enable tx prioritization
         version: 'v1',

tests/integration_tests/test_upgrade.py

@@ -92,12 +92,6 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     - check that queries on legacy blocks still works after upgrade.
     """
     cli = custom_ethermint.cosmos_cli()
-<<<<<<< HEAD
-    height = cli.block_height()
-    target_height = height + 10
-    print("upgrade height", target_height)
-=======
->>>>>>> v0.21.0
 
     w3 = custom_ethermint.w3
     contract, _ = deploy_contract(w3, CONTRACTS["TestERC20A"])