Conflicts:
	dashboard/v2/public/modules/details/detailsResource.js
	dashboard/v2/public/modules/lineage/lineageResource.js
	dashboard/v2/public/modules/search/searchResource.js