minor changes
fixed merge errors with style and music/new.html.erb