RavenDB-2348 Provide merge option for conflicted documents