Fix Merging errors

* This has deviated from SM quite a bit.  Fix this!

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