small addition/cleanup + resolved merge conflict

Author: tp

pandas/core/indexes/multi.py

@@ -2366,7 +2366,7 @@ def get_locs(self, seq):
 
  See also
  --------
- get_loc : Get location for a label or a tuple of labels.
+ MultiIndex.get_loc : Get location for a label or a tuple of labels.
  """
 
  # must be lexsorted to at least as many levels