merge remove-component-builder