Added code to automatically resolve conflicts when downloading from iCloud.