onlinelearningsystem/onlinelearningsystem/settings.py: needs merge code example Example: git error needs merge git reset --merge