First change
Made change in master
First change
Second change
fix
Merge branch 'feature0'

Conflicts:
	test.txt