fix failed merging.
fix doc