my first commit!
my second commit!
Merge branch 'my_feature_one'
Merge remote-tracking branch 'remotes/origin/master'