merge test
merge to master with no-ff
merge fast
Merge branch 'feature'

fast merge