REmoved bootstrap toolkit
Resolved merge conflict in settings.py
Removed resolution from projinfo query