diff --git a/app/consumer/genesis_test.go b/app/consumer/genesis_test.go
index 806d705e1c..afd5dec34e 100644
--- a/app/consumer/genesis_test.go
+++ b/app/consumer/genesis_test.go
@@ -215,9 +215,6 @@ func TestConsumerGenesisTransformationV2(t *testing.T) {
 
 	require.Empty(t, consumerGenesis.InitialValSet)
 	require.NotEmpty(t, consumerGenesis.Provider.InitialValSet)
-<<<<<<< HEAD
-=======
 	require.Equal(t, consumerGenesis.Params.RetryDelayPeriod, ccvtypes.DefaultRetryDelayPeriod)
 	require.Equal(t, consumerGenesis.NewChain, oldConsumerGenesis["new_chain"])
->>>>>>> f86c61f (fix: missing transformation for field 'new_chain' in ccv consumer genesis (#1509))
 }