'3' edit
pep edit 2

Conflicts:
	test.txt