+ ‘546545644 copy 2.txt’
Conflict resolution by SparkleShare