change 1 on dev1
change 1 on master
Merge branch 'dev1'
change 2 on master
change 2 on dev1