master first change
test branch first change
merging the two branches
master change 2
test branch change 2
merge number 2