Conflicts: public/app/features/panel/panel.ts public/app/features/panel/panel_directive.js public/app/plugins/datasource/grafana/module.ts
