- fixed merge conflict in MediaEngine class