change 1 commit 2
merge 2 branch