/ ‘test.rtf’
Conflict resolution by SparkleShare