Merged 'research' into master