skipDiffsForMerge = true