Tensions ease between the two parties over code-usage