diff --git a/ci/code_checks.sh b/ci/code_checks.sh
index 06e1d6575bcb8..9d6cae7b9bf93 100755
--- a/ci/code_checks.sh
+++ b/ci/code_checks.sh
@@ -73,17 +73,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
         -i "pandas.Period.freq GL08" \
         -i "pandas.Period.ordinal GL08" \
         -i "pandas.RangeIndex.from_range PR01,SA01" \
-<<<<<<< HEAD
         -i "pandas.Series.dt.unit GL08" \
         -i "pandas.Series.pad PR01,SA01" \
-=======
-        -i "pandas.Timedelta.max PR02" \
-        -i "pandas.Timedelta.min PR02" \
-        -i "pandas.Timedelta.resolution PR02" \
-        -i "pandas.Timestamp.max PR02" \
-        -i "pandas.Timestamp.min PR02" \
-        -i "pandas.Timestamp.resolution PR02" \
->>>>>>> upstream/main
         -i "pandas.Timestamp.tzinfo GL08" \
         -i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
         -i "pandas.arrays.IntervalArray.length SA01" \
diff --git a/pandas/_libs/tslibs/timedeltas.pyx b/pandas/_libs/tslibs/timedeltas.pyx
index b099c400ea0c4..b87e67a704888 100644
--- a/pandas/_libs/tslibs/timedeltas.pyx
+++ b/pandas/_libs/tslibs/timedeltas.pyx
@@ -1945,9 +1945,9 @@ class Timedelta(_Timedelta):
     _req_any_kwargs_new = {"weeks", "days", "hours", "minutes", "seconds",
                            "milliseconds", "microseconds", "nanoseconds"}
 
-    min = Timedelta(np.timedelta64(np.iinfo(np.int64).min + 1, 'ns'))
-    max = Timedelta(np.timedelta64(np.iinfo(np.int64).max, 'ns'))
-    resolution = Timedelta(1, unit='ns')
+    Timedelta.min = Timedelta(np.timedelta64(np.iinfo(np.int64).min + 1, 'ns'))
+    Timedelta.max = Timedelta(np.timedelta64(np.iinfo(np.int64).max, 'ns'))
+    Timedelta.resolution = Timedelta(1, unit='ns')
 
     def __new__(cls, object value=_no_input, unit=None, **kwargs):
         if value is _no_input: