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

This should be defined outside the `try` - if `call_command` raises, it won't be defined in the `finally` clause.