feature3 :adding new feature3
Merge branch 'feature2'