merge kanamori and yamashita