change song.rb
fix song.rb conflicts
unify song.rb