moving help feature
fixing merge conflicts