* (bug 889) Improve conflict-handling between shared upload repository (commons)...