kmerlin.cpp.diff