updated readme
resolve conflict