modified file3 after merge
Merge branch 'feature2'