RavenDB-2947 Do not consider the conflict item doc (e.g. items/1/conflicts/{guid}) as conflicted document in order to not apply the resolution from /studio-tasks/resolveMerge endpoint. Instead just show its content.
RavenDB-2947 Do not add "@metadata" string to MergeResult.Metadata. Adding tests for conflict resolutions in metadata.
Merge pull request #1601 from arekais/RavenDB-2947

Raven db 2947