Fix merge conflict

.github/workflows/test.yml

@@ -20,35 +20,3 @@ jobs:
         run: go test -mod=readonly -timeout 30m -coverprofile=coverage.txt -tags='norace' -covermode=atomic `go list ./... | grep -v simapp`
       - name: Codecov
         uses: codecov/codecov-action@v1.5.2
-<<<<<<< HEAD
-=======
-
-  liveness-test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-      - uses: technote-space/get-diff-action@v6.0.1
-        id: git_diff
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Install Starport
-        run: |
-          curl https://get.starport.network/starport@v0.19.5! | bash
-        if: env.GIT_DIFF
-      - name: Start Local Network via Starport
-        run: |
-          starport chain serve --reset-once -v -c ./starport.ci.yml > starport.out 2>&1 &
-        if: env.GIT_DIFF
-      - name: Test Local Network Liveness
-        run: |
-          sleep 3m
-          ./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost
-        if: env.GIT_DIFF
->>>>>>> eed3294 (update to go1.18 (#1177))