fixed bug with help
fixed merge conflict