File 3 edits on foo_feature
Merge branch 'foo_feature'