Scott Disick is known for picking fights but it seems that Kourtney Kardashian’s man is finally mending fences.

Scott has cleared up his differences with Kim’s best pal and Spin Crowd star Jonathan Cheeban, RadarOnline.com has exclusively learned.

PHOTOS:  Celebs Who Have Done Sex Tapes

“Scott was talking sh** about him really bad,” said a source close to the pair.

PHOTOS: Jonathan Cheban out with Ashley Holmes

Last month Disick, 27, attended an event at the Green Brook Country Club in North Caldwell, New Jersey, and according to a source he was overheard badmouthing the reality star and saying he would be nobody without Scott.

“Cheeban is a good guy and has turned the other cheek,” added the friend.

PHOTOS: Happy Birthday Kim See Her Style Over The Years

But Wednesday night, the pair seemed to have patched things up. They ran into each other at a star-studded birthday party Kim threw for Ciara at Greenhouse in Manhattan and before long the two were chatting and laughing.

“They seemed to be getting along great and even grabbed dinner together after the event,” the source said.

RELATED STORIES:

EXCLUSIVE: Kim Kardashian Cancelled Diamond Cake Surprise

PHOTOS: New Pictures Of Kim In Playboy

Kim Kardashian Says She's 'Totally Fine' After Bar Brawl