Fix merge conflict and modify Shibboleth stuff in settings.py