change in test branch
change in master
change in test 2
conflict fixed
iss1 fixed
master change
conflict fixed
hello
how are you
Merge branch 'iss1'
new master
new iss1
fixes