update from feature3
update-2 from feature3
Merge remote-tracking branch 'origin/feature/feature3'

Conflicts:
	File2