some file modified
Update some_file2.txt
some file 2 added !!!
Merge branch 'my_feature_branch' into feature_branch2