add git merge article, fix utf error in sass
regenerate