edited help
merge conflicts