queries
queries conflict fix