fixed merge issue in components.html