Dealing with conflict in a way that builds unity