Neovim works well for me. If you want to get some IDE-like features out of the box you can try AstroNvim https://github.com/AstroNvim/AstroNvim. I also use rust-tools for some extra features: https://github.com/simrat39/rust-tools.nvim. Customizing Neovim might be scary at first, but there are lots of resources to learn from and you can basically do anything you want with it.

With ~10 people on the team, many products, and dozens of repositories that we maintain, rarely. Maybe a few times per month. In the two years I've been with this company, I haven't run into a single merge conflict that wasn't straightforward to sort out.