update merge kyo & kanpai