delete the media file which is not present in master to simplify merging