added component.json
fixed merge