Alibaba’s Jack Ma sees resolution to Yahoo fight