fixed dropdown button z-index
merge fixes