Remove extra branch-alias from composer.json
Merge branch 'dev'