update components fix merge problems