Keep all fields when merging patients

When merging duplicates, keep all fields that are filled in across both patients. If we accidentally merge the wrong way, then we may lose some information.