iCloud merge issue fixed!