diff --git a/test/fixtures/tz-version.txt b/test/fixtures/tz-version.txt
index b74fa117a22328..9c7c8ffda703aa 100644
--- a/test/fixtures/tz-version.txt
+++ b/test/fixtures/tz-version.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 2022g
+=======
+2023c
+>>>>>>> 4204c5cffe (deps: update timezone to 2023c)