resolving conflict
Revert "added a line"

This reverts commit f6c5c81b0e6b82cb8185faeec367ea919df0819f.

Conflicts:
	text file.txt
cleanup
fourth line
fifth line
Revert "fourth line"

This reverts commit be35b25975b5ba0aae757d6ad29b81b4ef4bf46e.

Conflicts:
	text file.txt
my commit