I just want to add to this - as a manager you need to take initiative and designate a leader when conflict arises I had several months of constant arguing with

I just want to add to this - as a manager you need to take initiative and designate a leader when conflict arises I had several months of constant arguing with a coworker about what amounted to mostly style issue (I found his adherence to the style-guide overly OCD and a giant waste of time) However once the "boss" over ruled me and it was decided he's follow a stricter standard the issue was out of my hands, I was no longer responsible for the delays in deployment and to be honest I no longer really cared for the extra work. You need to be clear about the chain of responsibility here. When it's two coworkers arguing it's just a matter of opinion. PS: Don't underestimate you manager especially if they're experienced. The will have a lot fo insight if they are good. A lot of people are saying "Don't make it flat!!", but as long as you keep your boss in the loop - whatever organizational structure you bring you're still being "flat".