resolve conflict
fix version due to to component 0.x backward comp.