Merging from Master to Ishin