Fixing default.less merge errors