fix merge info in file