Fix merge conflict

webapp/forms.py

@@ -8,7 +8,7 @@ class KaehmyForm_Form(forms.ModelForm):
 
     class Meta:
         model = KaehmyForm
-        fields = ['name', 'email', 'year',
+        fields = ['name', 'email', 'phone_number', 'year',
                   'preset_roles', 'custom_roles', 'custom_role_name',
                   'custom_role_is_board', 'text']
 

webapp/migrations/0020_kaehmyform_phone_number.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 16:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0019_kaehmymessage_timestamp'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='kaehmyform',
+            name='phone_number',
+            field=phonenumber_field.modelfields.PhoneNumberField(default='', max_length=128, verbose_name='Phone number'),
+            preserve_default=False,
+        ),
+    ]

webapp/models.py

@@ -154,6 +154,7 @@ class KaehmyForm(MessageParent):
 
     name = models.CharField(_('Name'), max_length=255)
     email = models.EmailField(_('Email'))
+    phone_number = PhoneNumberField(_('Phone number'))
     year = models.IntegerField(_('Year'), choices=YEAR_CHOICES)
     text = models.TextField(_('Text'), default="", max_length=300)
     custom_roles = models.ManyToManyField(