Fixed spelling mistake in variable name

Beth keeps mentioning it...
Removed merge results from the source file
WIP enemy controller - all compile errors addressed