Merge client changes