yank diff funtion
merge