fixed conflicts

Author: Thomas Lautenschlaeger

pandas/core/apply.py

@@ -376,8 +376,11 @@ def agg_dict_like(self) -> DataFrame | Series:
         from pandas import Index
         from pandas.core.reshape.concat import concat
 
+        filtered_col = self._filter_numeric_only()
+
         obj = self.obj
         arg = cast(AggFuncTypeDict, self.f)
+        arg = {k: arg[k] for k in arg.keys() if k not in filtered_col}
 
         if getattr(obj, "axis", 0) == 1:
             raise NotImplementedError("axis other than 0 is not supported")