got rid of extra dropdowns that were added while fixing merge conflicts