Modified queries2.py and manage.py
Resolved merge conflicts.