add master merge options
add gitflow global support