Why would developer style cause merge conflicts? We did just fine, thanks.
The only way I can imagine how you never ran into this is that either your team is tiny, or that people don't touch other people's code. Both of which are not an option as you grow.