fix conflict

src/adega/management/__init__.py

src/adega/management/commands/__init__.py

src/adega/management/commands/analyze.py

src/script/.gitignore

src/script/analysis/course_analysis.py

src/script/analysis/degree_analysis.py

src/script/analysis/student_analysis.py

src/script/base/dataframe_base.py

src/script/build_cache.py

src/script/main.py

src/script/utils/situations.py

src/script/utils/utils.py

src/uploads/admin.py

src/uploads/models.py