merge component changes