pandora merge

@LoungeKatt is this okay?