merge master to music