Easier conflict resolution for Ubuntu One?

This might be more of an idea (http://brainstorm.ubuntu.com/idea/23128/) than a question, but I'm wondering if something like this is planned...

Today we resolve conflicts by "...picking from the original file (if there is one) and the conflict file the version that you wish to keep and to delete the conflict file or move the conflict file over the original one, depending on your choice."

It can be tiresome to look through the .u1conflict(.NN)-files using the standard Nautilus or gnome-terminal. Especially when there's a lot of them... In the spirit of making things as easy to use as possible, I think Ubuntu should have a graphical tool for resolving these conflicts.

A graphical tool for conflict resolution would let you compare the current file/folder with the conflicting file(s)/folder(s). The same goes for other u1-features like notes, contacts etc. The conflicting versions would be viewed side-by-side with the differences highlighted, and a suggested action to take for quick conflict resolution. Experience from revision control systems like CVS, SVN etc. could probably be applied here also for merging files.

For text, a diff could be shown. Graphical comparison of additional filetypes could be added later, for instance for GIMP-projects or ODS/XLS-spreadsheets, with differences highlighted. Author, time created and time modified are important attributes to look at when selecting what to keep and what to delete (or rename) and should be clearly visible.

I don't know if this would be part of the U1 Client, but is this within the scope of the Ubuntu One project, and will it be easier to resolve conflicts in the future?