gistfile1.txt

[14:08:39] space (asgardia_blog) git:(2017-may) $ ./manage.py migrate

DATABASES
{
    "default": {
        "ENGINE": "django.contrib.gis.db.backends.postgis",
        "NAME": "asgardia_blog",
        "USER": "postgres"
    }
}

CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0004_auto_20170504_1815, 0002_auto_20170423_1435 in contest).
To fix them run 'python manage.py makemigrations --merge'