diff --git a/.github/codecov.yml b/.github/codecov.yml
index 3c6af9e47d0..4bd60ea9c11 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -15,12 +15,19 @@ coverage:
   status:
     project:
       default:
+<<<<<<< HEAD
+        threshold: 0.5%
+    patch:
+      default:
+        threshold: 0.5%
+=======
         target: auto
         threshold: 0.5%
     patch:
       default:
         target: auto
         threshold: 1%
+>>>>>>> master
 
 flag_management:
   default_rules:
@@ -30,8 +37,12 @@ flag_management:
         target: auto
         threshold: 0.5%
       - type: patch
+<<<<<<< HEAD
+        threshold: 0.5%
+=======
         target: auto
         threshold: 1%
+>>>>>>> master
   individual_flags:
     - name: tm2
       paths:
diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
index e4d59671754..5adab48495f 100644
--- a/.github/workflows/gnoland.yml
+++ b/.github/workflows/gnoland.yml
@@ -73,7 +73,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: gno.land
-          flags: gno.land-${{matrix.args}}
+          flags: gno.land-${{matrix.args}}-${{matrix.go-version}}
           files: ./gno.land/coverage.out
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
index ec2526e1da9..b78af63ad31 100644
--- a/.github/workflows/gnovm.yml
+++ b/.github/workflows/gnovm.yml
@@ -77,7 +77,11 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: gnovm
+<<<<<<< HEAD
+          flags: gnovm-${{matrix.args}}-${{matrix.go-version}}
+=======
           verbose: true
           flags: gnovm-${{matrix.args}}
+>>>>>>> master
           files: ./gnovm/coverage.out
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml
index 8e0158011a1..53bcdc2dc23 100644
--- a/.github/workflows/tm2.yml
+++ b/.github/workflows/tm2.yml
@@ -67,7 +67,11 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: tm2
+<<<<<<< HEAD
+          flags: tm2-${{matrix.args}}-${{matrix.go-version}}
+=======
           verbose: true
           flags: tm2-${{matrix.args}}
+>>>>>>> master
           files: ./tm2/coverage.out
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
diff --git a/tm2/pkg/p2p/key.go b/tm2/pkg/p2p/key.go
index 71e3459f418..dfc2812216e 100644
--- a/tm2/pkg/p2p/key.go
+++ b/tm2/pkg/p2p/key.go
@@ -15,6 +15,22 @@ import (
 // Persistent peer ID
 // TODO: encrypt on disk
 
+func untestedCodeForCI() {
+	if true {
+		if true {
+			if true {
+				if true {
+					if true {
+						if true {
+							_ = 42
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 // NodeKey is the persistent peer key.
 // It contains the nodes private key for authentication.
 type NodeKey struct {