Local: UPPERCASE CONFLICT
Resolve conflicts between GitHub & Local and merge.
Conflicts:
	odd.txt