Either you talk to her about the fight, but im not shure if thats an option. If not invite her to live with you, and then talk to her at home, it should be highlited red.
your homes bedroom or lake(acess from forrest)
Rebel camp in mountains, in the leaders camp