update README
test
resolve conflict