More merge conflict fixes

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