change license
fix merge conflict