why what happend
fixed merge with git checkout --their file
Merge branch 'master' of github.com:wcweb/Chishiki