added drop down menu
fixing merging problem