merge諸々修正