delete lines
test2 change
edit
Merge branch 'testing'

Conflicts:
	test.txt