change README
resolve conflict in README