add client topic

possible merge conflict