merge main.less fix