diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
index c95d74938..94ac0e080 100644
--- a/.forge-snapshots/FullRangeAddInitialLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-410731
+407968
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
index e219c853d..d1198e0fd 100644
--- a/.forge-snapshots/FullRangeAddLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-204653
+201962
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
index d5b6f80c3..582739801 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidity.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1,5 +1 @@
-<<<<<<< HEAD
-200027
-=======
-197519
->>>>>>> 588ffde (update ticks counter)
+197519
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
index b92dced90..8e4734079 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1,5 +1 @@
-<<<<<<< HEAD
-386065
-=======
-379147
->>>>>>> 588ffde (update ticks counter)
+379147
\ No newline at end of file
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
index 4e4d29cc8..1ba4a8d1c 100644
--- a/.forge-snapshots/TWAMMSubmitOrder.snap
+++ b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-146128
+145648
\ No newline at end of file