p4mergedata.cpp #2