All's well that ends well for Ruffa, Shaina?

MANILA, Philippines – Have Ruffa Gutierrez and Shaina Magdayao finally mended their fences after their much-publicized rift years ago?

In an Instagram post on Tuesday, September 2, Ruffa revealed she chanced upon the ABS-CBN actress inside a gym.

“Back at the #HouseOfPain with @cjaplyo2 and guess who I bump into? After all these years, dito pa kami nagkita. And just like that, all's well that ends well. Peace, Shaina! #happyday,” Ruffa posted on her Instagram account. She also posted a photo of herself with Shaina.

Ruffa and Shaina had a rift after both being linked to actor John Lloyd Cruz.

READ: 'I would rather be alone than get hurt' 

Ruffa and John Lloyd were rumored to be dating in 2009, while John Lloyd admitted being in a relationship with Shaina in 2010. They broke up in 2012.