change about action
added test method
solve conflict
remove orig file
merge codes