From cf957507d744f5dedef9388b9854f987e687b4de Mon Sep 17 00:00:00 2001
From: Roman <roman@osmosis.team>
Date: Wed, 17 May 2023 15:06:30 -0400
Subject: [PATCH] fix: merge conflict

---
 x/concentrated-liquidity/lp_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x/concentrated-liquidity/lp_test.go b/x/concentrated-liquidity/lp_test.go
index 84512ff04ca..50dcfba66f0 100644
--- a/x/concentrated-liquidity/lp_test.go
+++ b/x/concentrated-liquidity/lp_test.go
@@ -7,6 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 
+	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
 	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"