modify readme
conflict management