add uicomponent column
fix conflict