Can search in your Dropbox for conflicted files and present you a clear way to merge them into one file again.