resolve merge conflict with dropdown.less