Partial Type
Rename/ConflictEngine/ConflictResolver.cs
Rename/ConflictEngine/ConflictResolver.Session.cs