Ability to resolve conflicts in the mapping

[joelvarty]

Once a conflict has been manually resolved in the content, we need a way to add that to the mapping so that it will understand that we've done that resolution.