update new_feature
update new_feature2
update 2 line
resolve.