diff --git a/testproj/articles/migrations/0001_initial.py b/testproj/articles/migrations/0001_initial.py
index 6d82083..b5bc38d 100644
--- a/testproj/articles/migrations/0001_initial.py
+++ b/testproj/articles/migrations/0001_initial.py
@@ -1,8 +1,9 @@
-# Generated by Django 2.0 on 2017-12-23 09:07
+# Generated by Django 2.0.1 on 2018-03-18 18:32
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import uuid
 
 
 class Migration(migrations.Migration):
@@ -23,8 +24,28 @@ class Migration(migrations.Migration):
                 ('slug', models.SlugField(blank=True, help_text='slug model help_text', unique=True)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('date_modified', models.DateTimeField(auto_now=True)),
+                ('article_type', models.PositiveSmallIntegerField(choices=[(1, 'first'), (2, 'second'), (3, 'third'), (7, 'seven'), (8, 'eight')], help_text='IntegerField declared on model with choices=(...) and exposed via ModelSerializer', null=True)),
                 ('cover', models.ImageField(blank=True, upload_to='article/original/')),
                 ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='articles', to=settings.AUTH_USER_MODEL)),
             ],
         ),
+        migrations.CreateModel(
+            name='ArticleGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)),
+                ('title', models.CharField(help_text='title model help_text', max_length=255, unique=True)),
+                ('slug', models.SlugField(blank=True, help_text='slug model help_text', unique=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.PROTECT, related_name='articles_as_main', to='articles.ArticleGroup'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='original_group',
+            field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.PROTECT, related_name='articles_as_original', to='articles.ArticleGroup'),
+        ),
     ]
diff --git a/testproj/articles/migrations/0002_article_article_type.py b/testproj/articles/migrations/0002_article_article_type.py
deleted file mode 100644
index abf6156..0000000
--- a/testproj/articles/migrations/0002_article_article_type.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.1 on 2018-02-26 18:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('articles', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='article',
-            name='article_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'first'), (2, 'second'), (3, 'third'), (7, 'seven'), (8, 'eight')], help_text='IntegerField declared on model with choices=(...) and exposed via ModelSerializer', null=True),
-        ),
-    ]
diff --git a/testproj/articles/migrations/0003_auto_20180310_0142.py b/testproj/articles/migrations/0003_auto_20180310_0142.py
deleted file mode 100644
index 9e608b1..0000000
--- a/testproj/articles/migrations/0003_auto_20180310_0142.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-10 01:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('articles', '0002_article_article_type'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ArticleGroup',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)),
-                ('title', models.CharField(help_text='title model help_text', max_length=255, unique=True)),
-                ('slug', models.SlugField(blank=True, help_text='slug model help_text', unique=True)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='article',
-            name='group',
-            field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.PROTECT, related_name='articles_as_main', to='articles.ArticleGroup'),
-        ),
-        migrations.AddField(
-            model_name='article',
-            name='original_group',
-            field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.PROTECT, related_name='articles_as_original', to='articles.ArticleGroup'),
-        ),
-    ]
diff --git a/testproj/people/migrations/0001_initial.py b/testproj/people/migrations/0001_initial.py
index 3c9b262..85ca04c 100644
--- a/testproj/people/migrations/0001_initial.py
+++ b/testproj/people/migrations/0001_initial.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-03-18 16:22
-from __future__ import unicode_literals
+# Generated by Django 2.0.1 on 2018-03-18 18:32
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -26,7 +24,7 @@ class Migration(migrations.Migration):
             name='Person',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('Identity', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='person', to='people.Identity')),
+                ('identity', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='person', to='people.Identity')),
             ],
         ),
     ]
diff --git a/testproj/people/migrations/0002_auto_20180318_1704.py b/testproj/people/migrations/0002_auto_20180318_1704.py
deleted file mode 100644
index 355f434..0000000
--- a/testproj/people/migrations/0002_auto_20180318_1704.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-03-18 17:04
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('people', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='person',
-            name='Identity',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='person', to='people.Identity'),
-        ),
-    ]
diff --git a/testproj/snippets/migrations/0001_initial.py b/testproj/snippets/migrations/0001_initial.py
index 57ae038..746e495 100644
--- a/testproj/snippets/migrations/0001_initial.py
+++ b/testproj/snippets/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0 on 2017-12-23 09:07
+# Generated by Django 2.0.1 on 2018-03-18 18:32
 
 from django.conf import settings
 from django.db import migrations, models
diff --git a/testproj/todo/migrations/0001_initial.py b/testproj/todo/migrations/0001_initial.py
index cecc6e4..3c63730 100644
--- a/testproj/todo/migrations/0001_initial.py
+++ b/testproj/todo/migrations/0001_initial.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-02-21 23:26
-from __future__ import unicode_literals
+# Generated by Django 2.0.1 on 2018-03-18 18:32
 
 from django.db import migrations, models
 import django.db.models.deletion