Issue pr test

Conflicts:

	newfile.txt