Hey Daniel! Sorry I missed your response. I think there is an element of commit reconciliation that goes on when merging. If you've squashed things, then those commits may not reconcile correctly.

That said, I've found it's almost impossible to avoid merge conflicts if multiple devs are working on the same line numbers in the same files, so the best solution I've found is to minimize the amount of work in each PR (small tickets) and have code owners (devs taking ownership for features).