refactor code conflict

.gitlab-ci.yml

administration/choices.py

administration/forms.py

administration/templates/administration/data_statistik.html

administration/templates/kelola_kontributor.html

administration/templates/laporan_materi.html

administration/templates/setting_verifikasi.html

administration/templates/verif.html

administration/tests.py

administration/views.py

app/forms.py

app/management/commands/generatedummy.py

app/management/commands/generatetraffic.py

app/management/commands/removetraffic.py

app/management/commands/utils.py

app/migrations/0003_auto_20200509_2108.py

app/migrations/0025_review.py

app/migrations/0027_readlater.py

app/models.py

app/services.py