adds Nyan Cat to songs
resolve conflict