post note but no merge
Merge branch 'master' of https://github.com/tukada-yosio/adi
complete diff3