ENH: Merge mixed source spaces with master