revise last commit
merge two different branch