help section updates
merge conflict fixes