Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/static/dashboard/dashboard.less