update readme
resolves conflicts