fix a issue related to manual merge
add license header