clientmerge.cc #1