diff passes diff merge