Adding merging of list from dropbox and drive
sync conflicts