add check media provider
merge conflicts