Hey, this is fairly common.
Just talk to her straight up. "We have a problem with how we solve conflicts. I think we both want each other to be happy, and to come out on top, but the only way that this is gonna work is if we let each other know exactly what we want from an outcome; of a...