/ ‘README.md’
Conflict resolution by SparkleShare