auto_merge: diff