ATLANTA — Stranger things have happened in hip-hop, but it was a shock to fans nonetheless: On Friday night, T.I. and Shawty Lo united onstage at Tip's Club Crucial.

The two have been going back and forth with dis songs and humorous jabs in interviews for more than a year. Everything came to a head November 24 when members of T.I.'s Grand Hustle clique clashed with Shawty Lo and his crew during the Dirty Awards in Atlanta. Tip and Lo apparently decided enough was enough.

"After that last altercation at the Dirty Awards, I told him my side of the story," Lo said Sunday in his studio, located in Atlanta's Bankhead neighborhood. "We talked for, like, 15 minutes. We decided in 2009, we're coming into a clean slate. And he's finnin' to go in. What better place to do it than in Bankhead at Club Crucial?

"It was unexpected," Lo continued. "We already talked. Me being a man, I just went up there, and the crowd went crazy. They was shocked. We dapped each other as soon as I hit the stage. It was a good feeling."

Despite the beef between the two being dead, Lo said making a song with Tip is probably premature thinking at this point, but it isn't impossible.

"We don't know," Lo said with a smile before going off to join the likes of Fat Joe, Jim Jones, Young Jeezy and DJ Drama and DJ Infamous' party at the Velvet Room. "Stay tuned. Everything is in the mix. We haven't talked about doing music since 2006, but at least we have been talking. It feels good to be here."

Lo is working on a new album, now titled I Am Carlos. The LP, due in June, features T-Pain, Mya, Trey Songz, Rick Ross and Bun thus far.