resolve merge conflict

app/forms.py

app/migrations/0027_auto_20201030_1648.py

app/models.py

app/templates/app/base_dashboard.html

app/templates/app/base_profile.html

app/templates/app/detail_materi.html

app/templates/app/katalog_kontri.html

app/templates/app/katalog_materi.html

app/templates/req_materi.html

app/templates/sunting.html

app/templates/unggah.html

app/tests.py

app/views.py

authentication/models.py

register/migrations/__init__.py

register/models.py

register/services.py

register/templates/email_verify.html

register/tests.py

register/urls.py