fixing merge conflict in modules-desktop.less