Microsoft: an end to open hostilities?