clientmerge3.h #1