Well you have the advantage that you know she's probably going to be upset. It's not like when conflict arises more randomly. I think the important thing is to make sure you keep yourself slowed down. Try not to let her yelling (if she's the type to yell) make you respond with yelling. If you're both yelling it just escalates things completely. Aside from that, just remember you're not doing anything you're doing to hurt her or put her out.