updated README
updated README
resolve conflict