When you watch Jane the Virgin Season 2 Episode 18, you'll see Jane and Xo continue to fight. After some interference from Rogelio, the two women make up. Jane completes her story on time and gets invited back to the program despite the fact that her advisor doesn't like her. Mateo calls Michael "Dada" in front of Rafael, which causes Rafael to want more time with his son and for Michael to talk to Jane about his place in Mateo's life. Petra learns more about her twin sister and decides to keep her around, but she doesn't realize her sister seems to really like Rafael. Rafael uses the dirty money he received from insider trading to buy another resort. Rogelio shares a kiss with Dina.