Push proactivity

Don't wait until there is conflict to establish a team charter. A charter, generated by team members, should specify guidelines and behavioral boundaries. This will set expectations and clarify what is acceptable and intolerant behavior. Make it clear that the charter can always be amended. Be sure everyone has a copy. Review it on a regular basis and go through it carefully with a new team member.