change file 1 in foo_feature branch
Merge branch 'foo_feature'

Conflicts:
	file1