smartassfalcon: fix merge derp