Resolve dashboard.less conflict from master.