If Melissa is joking with Julian about him cutting off her head then it's pretty clear their conflict is resolved and if there are any further problems they are going to be his fault.