sign contributor license agreement
Resolve conflict