merging stuff into client