Still trying to resolve merge conflicts...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>