Merge with client-server for the master