02-15-2016, 02:05 PM
If iCloud.com shows all necessary data, turn off iCloud on the misbehaving device and allow local iCloud data to be deleted from the device. When you sign in again on the device, it's fine to "merge" as the device has no data of its own to put in.