updating version of LESS
fixing up merge conflicts