Scott Disick and Khloe Kardashian’s on-again, off-again boyfriend French Montana reportedly settled their differences recently–over lunch.

So what kind of differences did the Keeping Up With the Kardashians star and the rapper have? It seems Scott Disick was supposed to appear in French Montana’s music video for his hit song ‘Don’t Panic,’ but he bailed on the rapper.

Scott Disick and French Montana seemed to have worked things out following their lunch on Thursday, however. They were spotted at a restaurant called Lovis in Calabasas. The pair even hugged each other before parting ways after their meal.

Khloe Kardashian was reportedly quite embarrassed when Scott Disick stood French Montana up for the music video. Disick used the excuse that since he just left rehab he didn’t want to be in any situation where he might be tempted by alcohol. Khloe claims French Montana was celebrating Ramadan, which means there was no alcohol on set–and she says Scott Disick knew that. He simply chose not to show up.

“What goes around comes around,” French said of the incident at the time.

Scott Disick and Khloe Kardashian's rumoured boyfriend French Montana put aside 'differences' with lunch http://t.co/b4O8IqtdQQ

— Irish Daily Mirror (@IrishMirror) April 3, 2015

Does it surprise you that Scott Disick would stand up French Montana? He manages to leave Kourtney Kardashian and his kids hanging frequently, too. It seems he has little concern for anyone other than himself.

Even though Scott Disick and French Montana worked out their differences, don’t expect French Montana to become part of the Keeping Up With the Kardashians family any time soon. Khloe Kardashian recently admitted that although she ‘loves’ him, she isn’t ready to settle down.