Additional small fixes

Author: ryankarlos

pandas/core/tools/timedeltas.py

@@ -84,12 +84,6 @@ def to_timedelta(arg, unit='ns', box=True, errors='raise'):
 
     >>> pd.to_timedelta(np.arange(5), box=False)
     array([0, 1, 2, 3, 4], dtype='timedelta64[ns]')
-<<<<<<< HEAD
-
-    See also
-
-=======
->>>>>>> improved styling
     """
     unit = parse_timedelta_unit(unit)