clientmerge2.cc #1