Fixing conflicting merge on custom less vars