file_1 commit
change
Merge remote-tracking branch 'origin/master'
update new feature
Merge branch 'new_feature'