docs
docs
resolve merge conflict in readme