settings.py conflicts resolved
git ignore mysite/mysite/settings.py