clientmerge3.cc #2