Conflicts are a part of human life and have been the reason for co-existence of people throughout times.
However, slightest bit of a wavy tone or a hint of aggression and things could go down hill from there.
There are few tried and tested methods that have been known to resolve this sort of tension.Keep ego out when you walk through the doorThis might seem bookish and maybe even impossible, but this is a method that has seen the best results.
When in such a close vicinity within other people there should always be personal boundaries that everyone should respect and a certain set of guidelines that everyone should follow.
Having unclarified roles at the workplaceThis might even be the most frustrating thing, but when one does not know the defined role they have been assigned, they could be a little put off.
It is the managers job to find and assign titles to everyone in his/her team and it may sometime happen so that maybe some people might not find the dismissal of this concern.