Fix merge derps

Signed-off-by: bmc08gt <brandon.mcansh@gmail.com>