add a new feature
merge new_feature