resolved conflicts

1 files changed, 7 insertions, 10 deletions

diff --git a/numpy/lib/arraypad.pyi b/numpy/lib/arraypad.pyi
index df9538dd7..49ce8e683 100644
--- a/numpy/lib/arraypad.pyi
+++ b/numpy/lib/arraypad.pyi
@@ -1,11 +1,12 @@
-import sys
 from typing import (
+    Literal as L,
     Any,
     Dict,
     List,
     overload,
     Tuple,
     TypeVar,
+    Protocol,
 )
 
 from numpy import ndarray, dtype, generic
@@ -18,20 +19,16 @@ from numpy.typing import (
     _SupportsArray,
 )
 
-if sys.version_info >= (3, 8):
-    from typing import Literal as L, Protocol
-else:
-    from typing_extensions import Literal as L, Protocol
-
 _SCT = TypeVar("_SCT", bound=generic)
 
 class _ModeFunc(Protocol):
     def __call__(
         self,
-        __vector: NDArray[Any],
-        __iaxis_pad_width: Tuple[int, int],
-        __iaxis: int,
-        __kwargs: Dict[str, Any],
+        vector: NDArray[Any],
+        iaxis_pad_width: Tuple[int, int],
+        iaxis: int,
+        kwargs: Dict[str, Any],
+        /,
     ) -> None: ...
 
 _ModeKind = L[