Start resolving this conflict.

... Is it just these two? One of them doesn't seem to be very concerned with the fact that she's pissed the other off.