fixed merge issue. fixed dropdown menus