new commit on master after branch feature1
Merge branch 'master' into feature1