build: fix merge derp