[skip ci] readme update
more documentation
resolve conflict