change a
Chagne b
merge
change a
Change a at master
merge master