Adding changes for publish reports, etc'
Resolving conflicts