clientmerge3.cc #1