client: pandora merge by ptitSeb refs #336