Fix merge

Signed-off-by: Frank S. Filz <ffilzlnx@mindspring.com>