Return an error when conflicts can't be resolved

If the two documents have differing fields which can't be resolved then
return a 400 error informing the user that they need to take further
action before the records can be merged.