readme changes ( git conflict demonstrations )