fix conflict

.gitignore

.gitlab-ci.yml

README.md

makefile

src/adega/settings.py

src/script/base/dataframe_base.py

src/script/main.py

src/uploads/admin.py

src/uploads/forms.py

src/uploads/models.py

src/uploads/views.py