Local edit 2

test
Conflict resolved

Conflicts:
	test.txt