The good news is that this file can (always!) be ignored at merge time. I’ll see if we can do that “single line per form” thing, though…
Edit: We did the single-line-per-form thing, and it shipped in 2023, so if you’re reading this now your merges should be much simpler. If you’re still experiencing nightmare merges, we’re looking for examples.