modify feature 2
Merge branch 'feature2'
add feature 4
merge feature4  with no-ff