The ENJF is my supervisor. I was making joke and he took it seriously and it hurt him. I apologized and that seemed to ease some tension but I could still feel there was tension. I have told him several times that my words don't always come out the right way and I did not mean what I said in a mean way. I think he only partially bought that explanation. Now how can I fix the relationship?