Microsoft and IBM Settle Differences