Be direct, speak your mind. Having that tension hanging over you every day in the workplace is not benefiting anyone. Get it out of the way and then move past it.