remove license
resolve conflict