Yes, what started as animosity, gradually turned into love. In the beginning, Merrin considered Cal Kestis her arch-enemy because, in her mind, the Jedi Order was the mastermind behind the Battle of Dathomir, and, therefore, every Jedi must pay for what they did to her sisters. However, upon realizing the truth, she started observing Cal more closely and ended up falling in love with him.