[typetypetype]

Have you tried to sit down and have an open conversation with this person? Sometimes doing this can really help diffuse tension.