update help_text
merge conflict