Merge two parameters that have the same meaning, add help text for new options