Mega Merge
kDiff3 error - no newline. nbd
fixed mapping