[FEATURE]: Merge conflicting migrations

[MatanYadaev]

Describe what you want

A way to merge multiple migrations that have the same ID.
This issue might occur when multiple developers add migrations in parallel in different PRs. It must be fixed somehow because otherwise the migrations won't work.
Currently the only way to fix these conflicting migrations are manually. I suggest having a command that will fix it automatically.

Django does it with the command makemigration --merge: https://docs.djangoproject.com/en/5.0/ref/django-admin/#cmdoption-makemigrations-merge