add api changes from sqlalchemy/sqlalchemy#6955 (#178)

Author: CaselIT

sqlalchemy-stubs/ext/asyncio/session.pyi

@@ -121,7 +121,12 @@ class _AsyncSessionProtocol(
         **kw: Any,
     ) -> Any: ...
     async def delete(self, instance: Any) -> None: ...
-    async def merge(self, instance: _T, load: bool = ...) -> _T: ...
+    async def merge(
+        self,
+        instance: _T,
+        load: bool = ...,
+        options: Optional[Sequence[Any]] = ...,
+    ) -> _T: ...
     async def flush(
         self, objects: Optional[Collection[Any]] = ...
     ) -> None: ...
@@ -152,12 +157,17 @@ class _AsyncSessionTypingCommon(
         self,
         entity: Type[_T],
         ident: Any,
-        options: Optional[Any] = ...,
+        options: Optional[Sequence[Any]] = ...,
         populate_existing: bool = ...,
         with_for_update: Optional[Any] = ...,
         identity_token: Optional[Any] = ...,
     ) -> Optional[_T]: ...
-    async def merge(self, instance: _T, load: bool = ...) -> _T: ...
+    async def merge(
+        self,
+        instance: _T,
+        load: bool = ...,
+        options: Optional[Sequence[Any]] = ...,
+    ) -> _T: ...
     async def refresh(
         self,
         instance: Any,

sqlalchemy-stubs/orm/session.pyi

@@ -150,7 +150,12 @@ class _SessionProtocol(
         ] = ...,
         identity_token: Optional[Any] = ...,
     ) -> Optional[_T]: ...
-    def merge(self, instance: _T, load: bool = ...) -> _T: ...
+    def merge(
+        self,
+        instance: _T,
+        load: bool = ...,
+        options: Optional[Sequence[Any]] = ...,
+    ) -> _T: ...
     def flush(self, objects: Optional[Collection[Any]] = ...) -> None: ...
     @classmethod
     def close_all(cls) -> None: ...  # NOTE: Deprecated.
@@ -387,7 +392,12 @@ class _SessionTypingCommon(
     def bulk_update_mappings(
         self, mapper: Any, mappings: Sequence[Mapping[str, Any]]
     ) -> None: ...
-    def merge(self, instance: _T, load: bool = ...) -> _T: ...
+    def merge(
+        self,
+        instance: _T,
+        load: bool = ...,
+        options: Optional[Sequence[Any]] = ...,
+    ) -> _T: ...
     def query(self, *entities: Any, **kwargs: Any) -> Query[Any]: ...
     def refresh(
         self,