fixing helpfiles
fixing merge conflict