dropdown changes
changes to merge conflict
Merge branch 'master' of github.com:anbublacky/nthat
file aligned