Those discussions largely resulted in “FOSS”, and a basic peace treaty. The two tended to use the same techniques and licenses in practice, and nobody really wanted to have that fight.