new work on feature1 branch
more work to merge
contents to be merged into master from feature1
more work to merge
finally master has work from feature1