When conflicts occur, there is always the revision history and the ability to revert to earlier editions.
Group items matching
in title, tags, annotations or urlSee a Time-Lapse "Movie" of All Your Google Docs Revisions - BetterCloud Monitor - 1 views
Android Apps to Support Bloom's Revised Taxonomy - 0 views
1More