Fix Merge Errors

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>