resolve conflic

administration/__init__.py

administration/admin.py

administration/apps.py

administration/forms.py

administration/migrations/0001_initial.py

administration/migrations/0002_auto_20200423_0317.py

administration/migrations/__init__.py

administration/models.py

administration/templates/setting_category.html

administration/templates/setting_verifikasi.html

administration/templates/verif.html

administration/tests.py

administration/urls.py

administration/views.py

app/forms.py

app/migrations/0008_auto_20200422_2144.py

app/migrations/0009_auto_20200422_2311.py

app/migrations/0011_auto_20200423_0355.py

app/migrations/0012_auto_20200423_1006.py

app/migrations/0013_merge_20200423_1221.py