/ ‘SparkleShare.txt’
Conflict resolution by SparkleShare