merge new music branch to master