query added
fix conflict