diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.reference b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
index da80de59e50..f29a9e2d1d5 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.reference
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
@@ -1,11 +1,11 @@
 -- { echo }
-<<<<<<< HEAD
+-- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
 SELECT toTimeZone(toDateTime(-2, 2), 'Europe/Moscow');
-1970-01-01 03:00:00.00
+1970-01-01 02:59:58.00
 SELECT toDateTime64(-2, 2, 'Europe/Moscow');
-1970-01-01 03:00:00.00
+1970-01-01 02:59:58.00
 SELECT CAST(-1 AS DateTime64(0, 'Europe/Moscow'));
-1970-01-01 03:00:00
+1970-01-01 02:59:59
 SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Europe/Moscow'));
 2020-01-01 00:00:00
 SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Europe/Moscow') FORMAT Null;
@@ -14,20 +14,8 @@ SELECT toTimeZone(toDateTime(-2., 2), 'Europe/Moscow');
 SELECT toDateTime64(-2., 2, 'Europe/Moscow');
 1970-01-01 03:00:00.00
 SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow');
-2106-02-07 09:00:00.00
+2106-02-07 09:28:16.00
 SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow') FORMAT Null;
-=======
--- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
-SELECT toDateTime(-2, 2);
-1970-01-01 02:59:58.00
-SELECT toDateTime64(-2, 2);
-1970-01-01 02:59:58.00
-SELECT CAST(-1 AS DateTime64);
-1970-01-01 02:59:59.000
-SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64);
-2020-01-01 00:00:00.300
-SELECT toDateTime64(bitShiftLeft(toUInt64(1),33), 2);
-2242-03-16 15:56:32.00
 -- These are outsize of extended range and hence clamped
 SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1),35), 2);
 1925-01-01 02:00:00.00
@@ -37,4 +25,3 @@ SELECT CAST(bitShiftLeft(toUInt64(1),35) AS DateTime64);
 2282-12-31 03:00:00.000
 SELECT toDateTime64(bitShiftLeft(toUInt64(1),35), 2);
 2282-12-31 03:00:00.00
->>>>>>> af31042451... Extended range of DateTime64 to years 1925 - 2238
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
index 228086615da..92639948fbc 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
@@ -1,9 +1,9 @@
 -- { echo }
 SELECT toString(toDateTime('-922337203.6854775808', 1));
-2106-02-07 15:41:33.6
+1940-10-09 22:13:17.6
 SELECT toString(toDateTime('9922337203.6854775808', 1));
-2104-12-30 00:50:11.6
+1925-07-26 00:46:43.6
 SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1);
-2106-02-07 20:50:08.1
+1928-01-11 00:46:40.1
 SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1);
-2011-12-23 00:38:08.1
+2011-12-22 00:13:20.1