conflicts fixed
conflict migrations are removed