/ ‘ghost/master/descript.txt’
Conflict resolution by SparkleShare