batch merge overwrites addresses rather than try to preserve them

When selecting the batch option to merge duplicates found in a group, if the duplicates have different addresses saved to the same location id, CiviCRM should try add the merged address to a new, unused location id and if that fails, it should report it as a conflict.

Instead, the main address overwrites the other address.