Merging jay to master