Merge client change