Fix merge conflict
Fix merge conflict

rutsky/aiohttp,singulared/aiohttp,juliatem/aiohttp,pfreixes/aiohttp,alex-eri/aiohttp-1,pfreixes/aiohttp,arthurdarcet/aiohttp,KeepSafe/aiohttp,AraHaanOrg/aiohttp,rutsky/aiohttp,Eyepea/aiohttp,KeepSafe/aiohttp,z2v/aiohttp,juliatem/aiohttp,KeepSafe/aiohttp,arthurdarcet/aiohttp,singulared/aiohttp,singulared/aiohttp,rutsky/aiohttp,AraHaanOrg/aiohttp,z2v/aiohttp,alex-eri/aiohttp-1,hellysmile/aiohttp,alex-eri/aiohttp-1,playpauseandstop/aiohttp,arthurdarcet/aiohttp,hellysmile/aiohttp,z2v/aiohttp