Khloe and Scott are friends now -- BIBLE! 

Khloe Kardashian and Scott Disick have famously feuded in the past, but it appears the two have finally worked through their issues. On Wednesday night Kourtney Kardashian's beau, 28, and Khloe, 27, partied together at T-Mobile Samsung Galaxy SII and HTC Amaze 4G's bash in NYC.

VIDEO: Scott flips out when his assistant buys him the wrong underwear

In a 2009 episode of Keeping Up with the Kardashians, Khloe literally slapped Disick when he came between her and Kourtney. The duo's relationship continued to worsen during Kourtney and Khloe Take Miami, when Disick's drinking impeded his ability to be a good boyfriend and father to Mason, 22 months. 

VIDEO: Khloe slaps Scott

In 2010, before Kim moved to NYC for hubby Kris Humphries, Disick demanded Kourtney and Mason move with him to the east coast. "100 percent we're moving to New York," he fumed in an episode of Keeping up with the Kardashians. Then, before blowing out the candles on his cake, he declared, "I know it's bad luck to tell your wish to everybody ... but my wish would be to get the hell away from her family in California and get to New York where my family is." 

VIDEO: Scott admits he hasn't been "100 percent sober"

Disick got his wish: Kourtney and Mason are living in the Big Apple while filming Kourtney and Kim Take New York. Even better, it seems that his long-running issues with Khloe and the Kardashians have finally evolved into a friendship.

Get more Us! Follow us on Twitter, Friend us on Facebook, Subscribe to Us Weekly