add ad_feature_test1.txt in new-feature branch with 3-Way Merge
add add_feature_test2.txt in new-feature branch with 3-Way Merge
add new feature file in master.
Merge branch 'new-feature'