Fixing merge conflicts
Fixing merge conflicts

dilini-muthumala/carbon-dashboards,ksdperera/carbon-dashboards,dnwick/carbon-dashboards,lasanthaS/carbon-dashboards,wso2/carbon-dashboards,ksdperera/carbon-dashboards,wso2/carbon-dashboards,dilini-muthumala/carbon-dashboards,ksdperera/carbon-dashboards,dilini-muthumala/carbon-dashboards,dnwick/carbon-dashboards,dnwick/carbon-dashboards,lasanthaS/carbon-dashboards,lasanthaS/carbon-dashboards