query builder schetched
merge fixed