Fix merge conflict, dropdown-list no longer needed