finished a query
Fixed merge