dropdown on style
Resolved conflict