I'm having trouble merging branches in Git. I keep getting conflicts, even though I'm pretty sure I'm not making conflicting changes. Any suggestions?

Have you tried running `git merge --fix-strategy=recursive`? This often resolves complex merge conflicts. Also, make sure you're using the same Git version on both branches.

That's a good tip, Jane. I'll give that a try. I'm using Git 2.38.0.