ADD line 2
Merge branch 'feature/4'

Conflicts:
	src/2_0_file