update a
updatde b
Merge branch 'development'
change in master
change on development
conflict