p4mergedata.cpp #7