update doc with new components
Fix conflict