merge pending conflict in MediaEmbed/plugin.js