GitHub Fix?

Resented to remove some GitHub merging notes in the source that were
crashing the program.