Updated queries2.py
Resolve merge conflicts.