Minor fix in help text and attempt to remerge