add instructions for using with iCloud
merge conflict