first feature
second feature
Merge branch 'feature/function1'

Conflicts:
	new file.txt