update component
fix merge