/ ‘Untitled 1.odt’
Conflict resolution by SparkleShare