In a positive turn of events, the rift between Fuji music icon, King Saheed Osupa and controversial singer Habeeb Okikiola Badmus, popularly known as Portable, has been amicably resolved out of court.