clientmerge2.h #2