Local changes to cause conflict
Resolved conflicts

Conflicts:
	newFile.txt