clientmerge.cc #2