diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt
index 8782f5a685..5c75690fc9 100644
--- a/NOTICE-fips.txt
+++ b/NOTICE-fips.txt
@@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/cockroachdb/pebble/v2
+<<<<<<< HEAD
 Version: v2.0.7
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
 Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.0.7/LICENSE:
+=======
+Version: v2.1.2
+Licence type (autodetected): BSD-3-Clause
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.1.2/LICENSE:
+>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
 
 Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
 
diff --git a/NOTICE.txt b/NOTICE.txt
index c7154efd76..46c34eac00 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/cockroachdb/pebble/v2
+<<<<<<< HEAD
 Version: v2.0.7
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
 Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.0.7/LICENSE:
+=======
+Version: v2.1.2
+Licence type (autodetected): BSD-3-Clause
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.1.2/LICENSE:
+>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
 
 Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
 
diff --git a/go.mod b/go.mod
index 5419fa5a7e..86889168aa 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,11 @@ go 1.25.4
 require (
 	github.com/KimMachineGun/automemlimit v0.7.5
 	github.com/cespare/xxhash/v2 v2.3.0
+<<<<<<< HEAD
 	github.com/cockroachdb/pebble/v2 v2.0.7
+=======
+	github.com/cockroachdb/pebble/v2 v2.1.2
+>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/apm-aggregation v1.4.0
 	github.com/elastic/apm-data v1.19.5
diff --git a/go.sum b/go.sum
index 0d2eb7e744..8e685f4719 100644
--- a/go.sum
+++ b/go.sum
@@ -122,8 +122,13 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
+<<<<<<< HEAD
 github.com/cockroachdb/pebble/v2 v2.0.7 h1:9TkE155mj6KPO14+06z8Jytbm7JVs0Einn+pKWNyPWQ=
 github.com/cockroachdb/pebble/v2 v2.0.7/go.mod h1:un1DXG73PKw3F7Ndd30YactyvsFviI9Fuhe0tENdnyA=
+=======
+github.com/cockroachdb/pebble/v2 v2.1.2 h1:IwYt+Y2Cdw6egblwk1kWzdmJvD2680t5VK/3i0BJ6IA=
+github.com/cockroachdb/pebble/v2 v2.1.2/go.mod h1:Aza05DCCc05ghIJZkB4Q/axv/JK9wx5cFwWcnhG0eGw=
+>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
 github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
 github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/swiss v0.0.0-20250624142022-d6e517c1d961 h1:Nua446ru3juLHLZd4AwKNzClZgL1co3pUPGv3o8FlcA=