merge problems

Signed-off-by: Dan Johnson <daniel.johnson@evanta.com>