clientmerge.h #2