improvements in documentation
resolving conflicts