update dropdown
merge