remove doc
solve confliction
update for rst table