[29/08/2011] Our last major set of improvements simplify and clean up the experience for resolving file name collisions, which we also refer to as "conflict resolution." At this point we can admit that the current experience can be rather confusing. People don't know which files are which, and they find it challenging to find the information they need to make a decision.