Remove less file, fix conflict in lately