add hankaku.txt, add display ABC 123.
reset.and commit.
fix conflict.