add showhide_button option "conflict"

This adds another option to the showhide_button: "conflict". See inline documentation for more info.