Shortened to just one beat
Merge branch 'feature'