revised some mistakes
merge