clientmerge2.cc #2