Conflicts:
	assets/js/dashboard/dashboard-mch.js