          """
          Makes sure that makemigrations properly merges the conflicting migrations.
          """
          stdout = six.StringIO()
          call_command("makemigrations", "migrations", merge=True, stdout=stdout)
          self.assertIn("Merging migrations", stdout.getvalue())
          self.assertIn("Branch 0002_second", stdout.getvalue())
          self.assertIn("Branch 0002_conflicting_second", stdout.getvalue())
  
      @override_system_checks([])
 
</s> remove         Makes sure that makemigrations properly merges the conflicting migrations.
 </s> add         Makes sure that makemigrations properly merges the conflicting migrations with --noinput. </s> remove     @override_system_checks([])
    @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"})
    def test_makemigrations_merge_basic(self):
        """
        Makes sure that makemigrations doesn't error if you ask for
        merge mode with a conflict present. Doesn't test writing of the merge
        file, as that requires temp directories.
        """
        try:
            call_command("makemigrations", merge=True, verbosity=0)
        except CommandError:
            self.fail("Makemigrations errored in merge mode with conflicts")

 </s> add  </s> remove             questioner = MigrationQuestioner()
 </s> add             questioner = MigrationQuestioner(defaults={'ask_merge': True})
        call_command("makemigrations", "migrations", merge=True, interactive=False, stdout=stdout)
          """
          Makes sure that makemigrations properly merges the conflicting migrations.
          """
          stdout = six.StringIO()
        call_command("makemigrations", "migrations", merge=True, interactive=False, stdout=stdout)
          self.assertIn("Merging migrations", stdout.getvalue())
          self.assertIn("Branch 0002_second", stdout.getvalue())
          self.assertIn("Branch 0002_conflicting_second", stdout.getvalue())
  
      @override_system_checks([])
keep keep keep keep replace keep keep keep keep keep
 Fixed #22862 -- Added --noinput option to makemigrations.

Thanks artortenburger for the report. 
tests/migrations/test_commands.py