Fix import overwrite nil values and add a unique new phone number
Fix conflicts after merging MH-567 to dev