title: Fix Conflicting migrations detected in Django1.9
body: <p>I updated <a href="https://github.com/dobarkod/django-dynamic-model" rel="noreferrer">django-dynamic-model</a> repository to support Django 1.9. I got this error:</p>
  
  <pre><code>CommandError: 
  
  Conflicting migrations detected; multiple leaf nodes in the migration
  graph: (0001_initial, 0002_auto__add_field_dynamicschemafield_extra in
  dynamicmodel).
  To fix them run 'python manage.py makemigrations --merge'
  </code></pre>
  
  <p>After running <code>python manage.py makemigrations --merge</code>, I got another error:</p>
  
  <pre><code> File "/local/lib/python2.7/sitepackages/django/core/management/__init__.py",  
  line 353, in execute_from_command_line
  utility.execute()
  
   File "/local/lib/python2.7/sitepackages/django/core/management/__init__.py", line 345, in execute
  self.fetch_command(subcommand).run_from_argv(self.argv)
  
   File 
  "/local/lib/python2.7/site-packages/django/core/management/base.py", line 348, in run_from_argv
  self.execute(*args, **cmd_options)
  
  File 
  "/local/lib/python2.7/site-packages/django/core/management/base.py", line 399, in execute
  output = self.handle(*args, **options)
  
  File 
  "/local/lib/python2.7/site-packages/django/core/management/commands/makemigrations.py", line 97, in handle
  return self.handle_merge(loader, conflicts)
  
  File 
     "/local/lib/python2.7/site-packages/django/core/management/commands/makemigrations.py", line 216, in handle_merge
   raise ValueError("Could not find common ancestor of %s" % migration_names)
  
  
   ValueError: Could not find common ancestor of set([u'0001_initial', u'0002_auto__add_field_dynamicschemafield_extra']). 
  </code></pre>
  
  <p>Help me to find the solution.</p>