add showhide_button option "conflict"
Merge pull request #783 from xi/feature-showhide-conflict

add showhide_button option "conflict"