I'm conflicted.
Obviously, deleting data is bad.
However, Dropbox's "(John Doe’s conflicted copy)" solution is also pretty awful UX. I can understand why Apple would want to use its uniquely integrated software ecosystem to come up with a better system. I believe they could do it—but they clearly have not.