Merge media creation bugfix