Fix conflicts in media