mergeconflict with inlinevideo widget
insert media new files