update readme
add dep diff-merge
diff block