> There is no way Dropbox can support merge conflict for arbitrary file types. For Dropbox, I agree. Apple could do it though; that's the advantage of having s

> There is no way Dropbox can support merge conflict for arbitrary file types. For Dropbox, I agree. Apple could do it though; that's the advantage of having such great control over your ecosystem.