Fixed #22862 -- Add noinput option to makemigrations and create migration when conflict is easily merged in noinput mode.

Thanks artortenburger for the report.