updating readme
mergin conflict