new design
music merge
removed music