diff --git a/src/gluonts/time_feature/lag.py b/src/gluonts/time_feature/lag.py
index a88395cf9d..c2215f139f 100644
--- a/src/gluonts/time_feature/lag.py
+++ b/src/gluonts/time_feature/lag.py
@@ -146,11 +146,7 @@ def _make_lags_for_month(multiple, num_cycles=3):
             + _make_lags_for_hour(offset.n / (60 * 60))
         )
     else:
-<<<<<<< HEAD
         raise ValueError(f"invalid frequency | `freq_str={freq_str}` -> `offset_name={offset_name}`")
-=======
-        raise ValueError(f"invalid frequency: {freq_str=}, {offset_name=}")
->>>>>>> 35598965 (Fix issues related to new Pandas offset names (#3117))
 
     # flatten lags list and filter
     lags = [