Committing change to file 3
Merge remote-tracking branch 'origin/bar_feature' into foo_feature