Modify for ver 2.0.1
Add option for showing merge-diff