Maybe this will fix the conflicts?

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