/ ‘readme.md’
Conflict resolution by SparkleShare