merge ok
merge and change license back