fixed documenting problem
resolving merge conflicts