Added documentation for conflict resolution of metadata
Added entries in CHANGES.rst
Whitespace