Fixed a merge derp

Left over <<<<<HEAD