Done with quantity dropdown
Resolved conflict