Any beef Demi Lovato ever had with her ex Joe Jonas and his brothers is officially over. It's either that -- or she's putting on a pretty good show!

That's because Joe's little bro Nick Jonas has been paired with Demi as a guest celebrity mentor for The X-Factor, according to The Hollywood Reporter. The duo will work together during the portion of the competition where final cuts are made, leaving only 16 singers, with each judge having four to mentor.

Related Article: Demi Lovato Reveals Her Greatest Fear Going Into Rehab

Demi and Nick have known each other for years since starring in Camp Rock, Camp Rock 2 and going on two tours together. After Demi left one of those tours due to a rough break up with Joe and entered rehab, contact was lost for a while, but it seems like things are better than ever now. The Give Your Heart a Break singer even brought Nick out on stage with her during a recent performance!

Aw! With all these friendships being rekindled... how great would it be if Demi and the JoBro's co-headlined a tour next year?! Let's get the ball rollin' on that one, please!

Do you think Demi and Nick are a good mentoring pair for the show?

Photos Courtesy of: Getty Images