cleaning up after merge mess - fixed typo, wording and reference.
cleaning up after merge mess - fixed typo, wording and reference.