Conflicts: js/components/ascribe_detail/media_container.js js/components/ascribe_media/media_player.js