Merging Changes fixing .less file