add vector
add queue
conflict fixed