resolve conflict in license header