The dispute on twitter started when West thought Khalifa was referring to Kim Kardashian in a tweet that was actually about weed, reported Entertainment Weekly.
"He apologized. I wouldn't necessarily say it's squashed though because when you see him talk about it, it doesn't add up to what he said to me on the phone, so I just don't even.." Khalifa, 28, said when asked about the feud.
The "See You Again" hitmaker also admitted that he was crying when the twitter clash took a turn towards his ex-wife Amber Rose who had nothing to do with the feud and their three-year-old son, Sebastian.