pandora merge

Sounds good. The only copy I see now is the same one I have locally, so it probably got picked up somewhere along the way.