Error setting up open edx using devstack

Hello
Currently I’m trying to setup open edx using devstack but I keep on encountering an error regarding migrations not sure why. I’m following this guide here https://blog.toddlichty.com/open-edx-installing-and-configuring-devstack/ but whenever I try to run the command make dev.provision I get the migrations error below. I tried to use the open-release/hawthorn.master branch and the open-release/ironwood.master but I get the same error, any help will be much appreciated thank you.

Traceback (most recent call last):
  File "manage.py", line 123, in <module>
    execute_from_command_line([sys.argv[0]] + django_args)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/__init__.py", line 381, in execute_from_command_line
    utility.execute()
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/__init__.py", line 375, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/base.py", line 323, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/base.py", line 364, in execute
    output = self.handle(*args, **options)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/base.py", line 83, in wrapped
    res = handle_func(*args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/core/management/commands/migrate.py", line 90, in handle
    executor.loader.check_consistent_history(connection)
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.5/site-packages/django/db/migrations/loader.py", line 299, in check_consistent_history
    connection.alias,
django.db.migrations.exceptions.InconsistentMigrationHistory: Migration commerce.0001_data__add_ecommerce_service_user is applied before its dependency user_api.0002_retirementstate_userretirementstatus on database 'default'.


Captured Task Output:
---------------------

---> pavelib.servers.update_db
---> pavelib.prereqs.install_prereqs
---> pavelib.prereqs.install_node_prereqs
---> pavelib.prereqs.install_python_prereqs
---> pavelib.prereqs.uninstall_python_packages
pip freeze > /edx/app/edxapp/edx-platform/test_root/log/pip_freeze.log
NO_EDXAPP_SUDO=1 EDX_PLATFORM_SETTINGS_OVERRIDE=devstack_docker /edx/bin/edxapp-migrate-lms --traceback --pythonpath=. 

Build failed running pavelib.servers.update_db: Subprocess return code: 1
Makefile:44: recipe for target 'dev.provision.run' failed
make: *** [dev.provision.run] Error 1

make pull solves this