add master 3
commit add 1 to rebase
merge from master