Fix merge conflicts

Author: MomIsBestFriend

pandas/core/indexers.py

@@ -31,7 +31,7 @@ def is_scalar_indexer(indexer, arr_value) -> bool:
     Returns
     -------
     bool
-        True if X are all scalar indexers.
+        True if we are all scalar indexers.
     """
     if arr_value.ndim == 1:
         if not isinstance(indexer, tuple):
@@ -143,11 +143,11 @@ def validate_indices(indices: np.ndarray, n: int) -> None:
     if len(indices):
         min_idx = indices.min()
         if min_idx < -1:
-            raise ValueError(
-                f"'indices' contains values less than allowed ({min_idx} < -1)"
-            )
+            msg = f"'indices' contains values less than allowed ({min_idx} < -1)"
+            raise ValueError(msg)
 
         max_idx = indices.max()
+
         if max_idx >= n:
             raise IndexError("indices are out-of-bounds")