Client code merge