Macau casino tycoon Ho says family row resolved