DJ Black Coffee and AKA finally settled their beef