resolve merge conflicts with main

Author: erikayasuda

ddtrace/contrib/internal/aiohttp/middlewares.py

@@ -59,14 +59,9 @@ async def attach_context(request):
             request[REQUEST_CONFIG_KEY] = app[CONFIG_KEY]
             try:
                 response = await handler(request)
-<<<<<<< HEAD
                 if not config.aiohttp["disable_stream_timing_for_mem_leak"]:
                     if isinstance(response, web.StreamResponse):
                         request.task.add_done_callback(lambda _: finish_request_span(request, response))
-=======
-                if isinstance(response, web.StreamResponse):
-                    request.task.add_done_callback(lambda _: finish_request_span(request, response))
->>>>>>> main
                 return response
             except Exception:
                 req_span.set_traceback()