World snooker champion Ronnie O’Sullivan has settled his differences with the sport’s governing body and is set to return to the main tour.