newfeature commit 3
newfeature commit 4
Merge branch 'newfeature'
newfeature commit 5
Merge branch 'newfeature'