Fix in query array pushing
fixed merge conflict