マージ要因 -> マージファクタ、 まとめ直前一文抜け修正

Github tool for windows can't handle Japanese correctly. I don't know
why. git diff doesn't work so that the commit changes every single line.