testing --no-ff
Merge branch 'myfeature'