local edit of delme.txt
remote update to delme.txt
newest changes to delme.txt
Merge remote-tracking branch 'origin/a-feature' into a-feature

Conflicts:
	delme.txt
cleanup