updating docs and log messages
resolving conflicts