resolved rebase issues

Author: davidmspeechmatics

pandas/core/generic.py

@@ -3,6 +3,9 @@
 import collections
 import functools
 import gc
+import warnings
+import weakref
+from datetime import timedelta
 from io import StringIO
 import json
 import operator
@@ -89,11 +92,13 @@
 from pandas.core.ops import align_method_FRAME
 from pandas.core.shared_docs import _shared_docs
 from pandas.core.window import Expanding, ExponentialMovingWindow, Rolling, Window
+from pandas.errors import AbstractMethodError, InvalidIndexError
 
 from pandas.io.formats import format as fmt
 from pandas.io.formats.format import DataFrameFormatter, format_percentiles
 from pandas.io.formats.printing import pprint_thing
 from pandas.util._decorators import doc, rewrite_axis_style_signature, Appender
+from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs, validate_percentile
 
 if TYPE_CHECKING:
     from pandas._libs.tslibs import BaseOffset