Merge conflicts with multi-env with "amplify checkout env xxx"

### Amplify CLI Version

12.10.1

### Question

There is a file `cli-input.json` that contains oAuthMetadata, with CallbackURLs and LogoutURLs props

Those properties are different for each environment. Which is causing conflict when switching "env" branches and merging changes between them.

Is there a way to avoid constant merge conflicts?

The workaround I'm using is to keep separate config files, `cli-inputs-dev.json` and copy them over when applying changes. Not very convenient.

Thanks!