modify at a
edit at b
Merge branches 'b' and 'master'
confilict
a