dropdown fix
Resolved conflict